You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/06 15:55:31 UTC
svn commit: r471754 [16/19] - in /struts/struts1/trunk:
apps/cookbook/src/main/java/examples/
apps/cookbook/src/main/java/examples/bean/
apps/cookbook/src/main/java/examples/dyna/
apps/cookbook/src/main/java/examples/links/ apps/cookbook/src/main/java/...
Modified: struts/struts1/trunk/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java (original)
+++ struts/struts1/trunk/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java Mon Nov 6 06:55:09 2006
@@ -1,17 +1,22 @@
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * $Id: $
*
- * 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
+ * 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
+ * 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.struts.taglib;
@@ -249,7 +254,7 @@
"SomeBean", null, null, "SomeBean", null, null, false);
// map = tagutils.computeParameters(
- // page, "paramId", "SomeBean", "stringArray", null,
+ // page, "paramId", "SomeBean", "stringArray", null,
// null, null, null, false);
assertNotNull("map is null", map);
@@ -622,7 +627,7 @@
}
assertNotNull("url present", url);
- assertEquals("url value",
+ assertEquals("url value",
// "/myapp/relative.jsp",
"relative.jsp", url);
}
@@ -641,7 +646,7 @@
}
assertNotNull("url present", url);
- assertEquals("url value",
+ assertEquals("url value",
// "/myapp/relative.jsp",
"relative.jsp", url);
}
@@ -770,7 +775,7 @@
}
assertNotNull("url present", url);
- assertEquals("url value",
+ assertEquals("url value",
// "/myapp/2/relative.jsp",
"relative.jsp", url);
}
@@ -790,7 +795,7 @@
}
assertNotNull("url present", url);
- assertEquals("url value",
+ assertEquals("url value",
// "/myapp/relative.jsp",
"relative.jsp", url);
}
@@ -967,9 +972,9 @@
|| url.equals("/myapp/bar?foo2=bar2&foo1=bar1"));
}
- // Add parameters only
- // -- forward URL
- // -- do not encode seperator
+ // Add parameters only
+ // -- forward URL
+ // -- do not encode seperator
// -- send param with null value
public void testComputeURL3h() {
request.setPathElements("/myapp", "/action.do", null, null);
@@ -991,9 +996,9 @@
assertTrue("url value", url.equals("/myapp/bar?foo1="));
}
- // Add parameters only
- // -- forward URL
- // -- do not encode seperator
+ // Add parameters only
+ // -- forward URL
+ // -- do not encode seperator
// -- send param with null value
// -- add ? to page
public void testComputeURL3i() {
@@ -1016,9 +1021,9 @@
assertTrue("url value", url.equals("/myapp/bar?&foo1="));
}
- // Add parameters only
- // -- forward URL
- // -- do not encode seperator
+ // Add parameters only
+ // -- forward URL
+ // -- do not encode seperator
// -- send param with null value
// -- add ? and param to page
public void testComputeURL3j() {
@@ -1567,7 +1572,7 @@
}
// ------------------------------------------ getActionMessages()
- // -- using ActionMessages
+ // -- using ActionMessages
public void testActionMessages_getActionMessages_PageContext_String1() {
ActionMessages actionMessages = new ActionMessages();
@@ -1599,7 +1604,7 @@
}
}
- // -- using ActionErrors
+ // -- using ActionErrors
public void testActionMessages_getActionMessages_PageContext_String2() {
ActionMessages actionMessages = new ActionMessages();
@@ -1631,7 +1636,7 @@
}
}
- // -- using String
+ // -- using String
public void testActionMessages_getActionMessages_PageContext_String3() {
request.setAttribute("foo", "bar");
@@ -1665,7 +1670,7 @@
}
}
- // -- using String Array
+ // -- using String Array
public void testActionMessages_getActionMessages_PageContext_String4() {
String[] vals = new String[] { "bar", "baz" };
@@ -2168,24 +2173,24 @@
fail("JspException should not have been thrown");
}
}
-
+
public void testOverrideInstance(){
-
+
class CustomTagUtils extends TagUtils{
- public String filter(String value) {
- return "I HAVE BEEN OVERRIDDEN!";
- }
+ public String filter(String value) {
+ return "I HAVE BEEN OVERRIDDEN!";
+ }
}
// verify original logic
assertNull("Filter Test", TagUtils.getInstance().filter(null));
-
+
// set the custom instance
TagUtils.setInstance(new CustomTagUtils());
assertEquals("Custom Instance Test", TagUtils.getInstance().filter(null), "I HAVE BEEN OVERRIDDEN!");
-
+
// reset back to the cached instance
TagUtils.setInstance(tagutils);
assertNull("Filter Test", TagUtils.getInstance().filter(null));
-
+
}
}
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ActionController.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/AttributeDefinition.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentContext.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinition.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ComponentDefinitionsFactory.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/Controller.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/ControllerSupport.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionAttribute.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionNameAttribute.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactory.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryConfig.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsFactoryException.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DefinitionsUtil.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/DirectStringAttribute.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/FactoryNotFoundException.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/NoSuchDefinitionException.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/PathAttribute.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesException.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesPlugin.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesRequestProcessor.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
- * $Id$
+ * $Id$
*
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.struts.tiles;
@@ -51,355 +54,355 @@
*/
public class TilesRequestProcessor extends RequestProcessor {
- /**
- * Definitions factory.
- */
- protected DefinitionsFactory definitionsFactory = null;
-
- /**
- * Commons Logging instance.
- */
- protected static Log log = LogFactory.getLog(TilesRequestProcessor.class);
-
- /**
- * Initialize this request processor instance.
- *
- * @param servlet The ActionServlet we are associated with.
- * @param moduleConfig The ModuleConfig we are associated with.
- * @throws ServletException If an error occurs during initialization.
- */
- public void init(ActionServlet servlet, ModuleConfig moduleConfig)
- throws ServletException {
-
- super.init(servlet, moduleConfig);
- this.initDefinitionsMapping();
- }
-
- /**
- * Read component instance mapping configuration file.
- * This is where we read files properties.
- */
- protected void initDefinitionsMapping() throws ServletException {
- // Retrieve and set factory for this modules
- definitionsFactory =
- (
- (TilesUtilStrutsImpl) TilesUtil
- .getTilesUtil())
- .getDefinitionsFactory(
- getServletContext(),
- moduleConfig);
-
- if (definitionsFactory == null) { // problem !
-
- log.info(
- "Definition Factory not found for module '"
- + moduleConfig.getPrefix()
- + "'. "
- + "Have you declared the appropriate plugin in struts-config.xml ?");
-
- return;
- }
-
- log.info(
- "Tiles definition factory found for request processor '"
- + moduleConfig.getPrefix()
- + "'.");
-
- }
-
- /**
- * Process a Tile definition name.
- * This method tries to process the parameter <code>definitionName</code>
+ /**
+ * Definitions factory.
+ */
+ protected DefinitionsFactory definitionsFactory = null;
+
+ /**
+ * Commons Logging instance.
+ */
+ protected static Log log = LogFactory.getLog(TilesRequestProcessor.class);
+
+ /**
+ * Initialize this request processor instance.
+ *
+ * @param servlet The ActionServlet we are associated with.
+ * @param moduleConfig The ModuleConfig we are associated with.
+ * @throws ServletException If an error occurs during initialization.
+ */
+ public void init(ActionServlet servlet, ModuleConfig moduleConfig)
+ throws ServletException {
+
+ super.init(servlet, moduleConfig);
+ this.initDefinitionsMapping();
+ }
+
+ /**
+ * Read component instance mapping configuration file.
+ * This is where we read files properties.
+ */
+ protected void initDefinitionsMapping() throws ServletException {
+ // Retrieve and set factory for this modules
+ definitionsFactory =
+ (
+ (TilesUtilStrutsImpl) TilesUtil
+ .getTilesUtil())
+ .getDefinitionsFactory(
+ getServletContext(),
+ moduleConfig);
+
+ if (definitionsFactory == null) { // problem !
+
+ log.info(
+ "Definition Factory not found for module '"
+ + moduleConfig.getPrefix()
+ + "'. "
+ + "Have you declared the appropriate plugin in struts-config.xml ?");
+
+ return;
+ }
+
+ log.info(
+ "Tiles definition factory found for request processor '"
+ + moduleConfig.getPrefix()
+ + "'.");
+
+ }
+
+ /**
+ * Process a Tile definition name.
+ * This method tries to process the parameter <code>definitionName</code>
* as a definition name.
- * It returns <code>true</code> if a definition has been processed, or
+ * It returns <code>true</code> if a definition has been processed, or
* <code>false</code> otherwise.
- * This method is deprecated; the method without the
+ * This method is deprecated; the method without the
* <code>contextRelative</code> parameter should be used instead.
- *
- * @param definitionName Definition name to insert.
- * @param contextRelative Is the definition marked contextRelative ?
- * @param request Current page request.
- * @param response Current page response.
- * @return <code>true</code> if the method has processed uri as a
+ *
+ * @param definitionName Definition name to insert.
+ * @param contextRelative Is the definition marked contextRelative ?
+ * @param request Current page request.
+ * @param response Current page response.
+ * @return <code>true</code> if the method has processed uri as a
* definition name, <code>false</code> otherwise.
* @deprecated use processTilesDefinition(definitionName, request, response)
* instead. This method will be removed in a version after 1.3.0.
- */
- protected boolean processTilesDefinition(
- String definitionName,
- boolean contextRelative,
- HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
+ */
+ protected boolean processTilesDefinition(
+ String definitionName,
+ boolean contextRelative,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException {
return processTilesDefinition(definitionName, request, response);
-
+
}
-
- /**
- * Process a Tile definition name.
- * This method tries to process the parameter <code>definitionName</code>
+
+ /**
+ * Process a Tile definition name.
+ * This method tries to process the parameter <code>definitionName</code>
* as a definition name.
- * It returns <code>true</code> if a definition has been processed, or
+ * It returns <code>true</code> if a definition has been processed, or
* <code>false</code> otherwise.
- *
- * @param definitionName Definition name to insert.
- * @param request Current page request.
- * @param response Current page response.
- * @return <code>true</code> if the method has processed uri as a
+ *
+ * @param definitionName Definition name to insert.
+ * @param request Current page request.
+ * @param response Current page response.
+ * @return <code>true</code> if the method has processed uri as a
* definition name, <code>false</code> otherwise.
- */
- protected boolean processTilesDefinition(
- String definitionName,
- HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
-
- // Do we do a forward (original behavior) or an include ?
- boolean doInclude = false;
-
- // Controller associated to a definition, if any
- Controller controller = null;
-
- // Computed uri to include
- String uri = null;
-
- ComponentContext tileContext = null;
-
- try {
- // Get current tile context if any.
- // If context exist, we will do an include
- tileContext = ComponentContext.getContext(request);
- doInclude = (tileContext != null);
- ComponentDefinition definition = null;
-
- // Process tiles definition names only if a definition factory exist,
- // and definition is found.
- if (definitionsFactory != null) {
- // Get definition of tiles/component corresponding to uri.
- try {
- definition =
- definitionsFactory.getDefinition(
- definitionName,
- request,
- getServletContext());
- } catch (NoSuchDefinitionException ex) {
- // Ignore not found
- log.debug("NoSuchDefinitionException " + ex.getMessage());
- }
- if (definition != null) { // We have a definition.
- // We use it to complete missing attribute in context.
- // We also get uri, controller.
- uri = definition.getPath();
- controller = definition.getOrCreateController();
-
- if (tileContext == null) {
- tileContext =
- new ComponentContext(definition.getAttributes());
- ComponentContext.setContext(tileContext, request);
-
- } else {
- tileContext.addMissing(definition.getAttributes());
- }
- }
- }
-
- // Process definition set in Action, if any.
- definition = DefinitionsUtil.getActionDefinition(request);
- if (definition != null) { // We have a definition.
- // We use it to complete missing attribute in context.
- // We also overload uri and controller if set in definition.
- if (definition.getPath() != null) {
- uri = definition.getPath();
- }
-
- if (definition.getOrCreateController() != null) {
- controller = definition.getOrCreateController();
- }
-
- if (tileContext == null) {
- tileContext =
- new ComponentContext(definition.getAttributes());
- ComponentContext.setContext(tileContext, request);
- } else {
- tileContext.addMissing(definition.getAttributes());
- }
- }
-
- } catch (java.lang.InstantiationException ex) {
-
- log.error("Can't create associated controller", ex);
-
- throw new ServletException(
- "Can't create associated controller",
- ex);
- } catch (DefinitionsFactoryException ex) {
- throw new ServletException(ex);
- }
-
- // Have we found a definition ?
- if (uri == null) {
- return false;
- }
-
- // Execute controller associated to definition, if any.
- if (controller != null) {
- try {
- controller.execute(
- tileContext,
- request,
- response,
- getServletContext());
-
- } catch (Exception e) {
- throw new ServletException(e);
- }
- }
-
- // If request comes from a previous Tile, do an include.
- // This allows to insert an action in a Tile.
- if (log.isDebugEnabled()) {
- log.debug("uri=" + uri + " doInclude=" + doInclude);
- }
-
- if (doInclude) {
- doInclude(uri, request, response);
- } else {
- doForward(uri, request, response); // original behavior
- }
-
- return true;
- }
-
- /**
- * Do a forward using request dispatcher.
- * Uri is a valid uri. If response has already been commited, do an include
- * instead.
- * @param uri Uri or Definition name to forward.
- * @param request Current page request.
- * @param response Current page response.
- */
- protected void doForward(
- String uri,
- HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
-
- if (response.isCommitted()) {
- this.doInclude(uri, request, response);
-
- } else {
- super.doForward(uri, request, response);
- }
- }
-
- /**
- * Overloaded method from Struts' RequestProcessor.
- * Forward or redirect to the specified destination by the specified
- * mechanism.
- * This method catches the Struts' actionForward call. It checks if the
- * actionForward is done on a Tiles definition name. If true, process the
- * definition and insert it. If false, call the original parent's method.
- * @param request The servlet request we are processing.
- * @param response The servlet response we are creating.
- * @param forward The ActionForward controlling where we go next.
- *
- * @exception IOException if an input/output error occurs.
- * @exception ServletException if a servlet exception occurs.
- */
- protected void processForwardConfig(
- HttpServletRequest request,
- HttpServletResponse response,
- ForwardConfig forward)
- throws IOException, ServletException {
-
- // Required by struts contract
- if (forward == null) {
- return;
- }
-
- if (log.isDebugEnabled()) {
- log.debug(
- "processForwardConfig("
- + forward.getPath()
- + ")");
- }
-
- // Try to process the definition.
- if (processTilesDefinition(forward.getPath(),
- request,
- response)) {
- if (log.isDebugEnabled()) {
- log.debug(
- " '" + forward.getPath() + "' - processed as definition");
- }
- return;
- }
-
- if (log.isDebugEnabled()) {
- log.debug(" '" + forward.getPath() + "' - processed as uri");
- }
-
- // forward doesn't contain a definition, let parent do processing
- super.processForwardConfig(request, response, forward);
- }
-
- /**
- * Catch the call to a module relative forward.
- * If the specified uri is a tiles definition name, insert it.
- * Otherwise, parent processing is called.
- * Do a module relative forward to specified uri using request dispatcher.
- * Uri is relative to the current module. The real uri is computed by
+ */
+ protected boolean processTilesDefinition(
+ String definitionName,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException {
+
+ // Do we do a forward (original behavior) or an include ?
+ boolean doInclude = false;
+
+ // Controller associated to a definition, if any
+ Controller controller = null;
+
+ // Computed uri to include
+ String uri = null;
+
+ ComponentContext tileContext = null;
+
+ try {
+ // Get current tile context if any.
+ // If context exist, we will do an include
+ tileContext = ComponentContext.getContext(request);
+ doInclude = (tileContext != null);
+ ComponentDefinition definition = null;
+
+ // Process tiles definition names only if a definition factory exist,
+ // and definition is found.
+ if (definitionsFactory != null) {
+ // Get definition of tiles/component corresponding to uri.
+ try {
+ definition =
+ definitionsFactory.getDefinition(
+ definitionName,
+ request,
+ getServletContext());
+ } catch (NoSuchDefinitionException ex) {
+ // Ignore not found
+ log.debug("NoSuchDefinitionException " + ex.getMessage());
+ }
+ if (definition != null) { // We have a definition.
+ // We use it to complete missing attribute in context.
+ // We also get uri, controller.
+ uri = definition.getPath();
+ controller = definition.getOrCreateController();
+
+ if (tileContext == null) {
+ tileContext =
+ new ComponentContext(definition.getAttributes());
+ ComponentContext.setContext(tileContext, request);
+
+ } else {
+ tileContext.addMissing(definition.getAttributes());
+ }
+ }
+ }
+
+ // Process definition set in Action, if any.
+ definition = DefinitionsUtil.getActionDefinition(request);
+ if (definition != null) { // We have a definition.
+ // We use it to complete missing attribute in context.
+ // We also overload uri and controller if set in definition.
+ if (definition.getPath() != null) {
+ uri = definition.getPath();
+ }
+
+ if (definition.getOrCreateController() != null) {
+ controller = definition.getOrCreateController();
+ }
+
+ if (tileContext == null) {
+ tileContext =
+ new ComponentContext(definition.getAttributes());
+ ComponentContext.setContext(tileContext, request);
+ } else {
+ tileContext.addMissing(definition.getAttributes());
+ }
+ }
+
+ } catch (java.lang.InstantiationException ex) {
+
+ log.error("Can't create associated controller", ex);
+
+ throw new ServletException(
+ "Can't create associated controller",
+ ex);
+ } catch (DefinitionsFactoryException ex) {
+ throw new ServletException(ex);
+ }
+
+ // Have we found a definition ?
+ if (uri == null) {
+ return false;
+ }
+
+ // Execute controller associated to definition, if any.
+ if (controller != null) {
+ try {
+ controller.execute(
+ tileContext,
+ request,
+ response,
+ getServletContext());
+
+ } catch (Exception e) {
+ throw new ServletException(e);
+ }
+ }
+
+ // If request comes from a previous Tile, do an include.
+ // This allows to insert an action in a Tile.
+ if (log.isDebugEnabled()) {
+ log.debug("uri=" + uri + " doInclude=" + doInclude);
+ }
+
+ if (doInclude) {
+ doInclude(uri, request, response);
+ } else {
+ doForward(uri, request, response); // original behavior
+ }
+
+ return true;
+ }
+
+ /**
+ * Do a forward using request dispatcher.
+ * Uri is a valid uri. If response has already been commited, do an include
+ * instead.
+ * @param uri Uri or Definition name to forward.
+ * @param request Current page request.
+ * @param response Current page response.
+ */
+ protected void doForward(
+ String uri,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException {
+
+ if (response.isCommitted()) {
+ this.doInclude(uri, request, response);
+
+ } else {
+ super.doForward(uri, request, response);
+ }
+ }
+
+ /**
+ * Overloaded method from Struts' RequestProcessor.
+ * Forward or redirect to the specified destination by the specified
+ * mechanism.
+ * This method catches the Struts' actionForward call. It checks if the
+ * actionForward is done on a Tiles definition name. If true, process the
+ * definition and insert it. If false, call the original parent's method.
+ * @param request The servlet request we are processing.
+ * @param response The servlet response we are creating.
+ * @param forward The ActionForward controlling where we go next.
+ *
+ * @exception IOException if an input/output error occurs.
+ * @exception ServletException if a servlet exception occurs.
+ */
+ protected void processForwardConfig(
+ HttpServletRequest request,
+ HttpServletResponse response,
+ ForwardConfig forward)
+ throws IOException, ServletException {
+
+ // Required by struts contract
+ if (forward == null) {
+ return;
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "processForwardConfig("
+ + forward.getPath()
+ + ")");
+ }
+
+ // Try to process the definition.
+ if (processTilesDefinition(forward.getPath(),
+ request,
+ response)) {
+ if (log.isDebugEnabled()) {
+ log.debug(
+ " '" + forward.getPath() + "' - processed as definition");
+ }
+ return;
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug(" '" + forward.getPath() + "' - processed as uri");
+ }
+
+ // forward doesn't contain a definition, let parent do processing
+ super.processForwardConfig(request, response, forward);
+ }
+
+ /**
+ * Catch the call to a module relative forward.
+ * If the specified uri is a tiles definition name, insert it.
+ * Otherwise, parent processing is called.
+ * Do a module relative forward to specified uri using request dispatcher.
+ * Uri is relative to the current module. The real uri is computed by
* prefixing the module name.
- * <strong>This method is used internally and is not part of the public
+ * <strong>This method is used internally and is not part of the public
* API. It is advised to not use it in subclasses.</strong>
- * @param uri Module-relative URI to forward to.
- * @param request Current page request.
- * @param response Current page response.
- * @since Struts 1.1
- */
- protected void internalModuleRelativeForward(
- String uri,
- HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
-
- if (processTilesDefinition(uri, request, response)) {
- return;
- }
-
- super.internalModuleRelativeForward(uri, request, response);
- }
-
- /**
- * Do a module relative include to specified uri using request dispatcher.
- * Uri is relative to the current module. The real uri is computed by
+ * @param uri Module-relative URI to forward to.
+ * @param request Current page request.
+ * @param response Current page response.
+ * @since Struts 1.1
+ */
+ protected void internalModuleRelativeForward(
+ String uri,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException {
+
+ if (processTilesDefinition(uri, request, response)) {
+ return;
+ }
+
+ super.internalModuleRelativeForward(uri, request, response);
+ }
+
+ /**
+ * Do a module relative include to specified uri using request dispatcher.
+ * Uri is relative to the current module. The real uri is computed by
* prefixing the module name.
- * <strong>This method is used internally and is not part of the public
+ * <strong>This method is used internally and is not part of the public
* API. It is advised to not use it in subclasses.</strong>
- * @param uri Module-relative URI to forward to.
- * @param request Current page request.
- * @param response Current page response.
- * @since Struts 1.1
- */
- protected void internalModuleRelativeInclude(
- String uri,
- HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
-
- if (processTilesDefinition(uri, request, response)) {
- return;
- }
-
- super.internalModuleRelativeInclude(uri, request, response);
- }
-
- /**
- * Get associated definition factory.
- */
- public DefinitionsFactory getDefinitionsFactory() {
- return definitionsFactory;
- }
+ * @param uri Module-relative URI to forward to.
+ * @param request Current page request.
+ * @param response Current page response.
+ * @since Struts 1.1
+ */
+ protected void internalModuleRelativeInclude(
+ String uri,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException {
+
+ if (processTilesDefinition(uri, request, response)) {
+ return;
+ }
+
+ super.internalModuleRelativeInclude(uri, request, response);
+ }
+
+ /**
+ * Get associated definition factory.
+ */
+ public DefinitionsFactory getDefinitionsFactory() {
+ return definitionsFactory;
+ }
}
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtil.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilImpl.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsImpl.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UntypedAttribute.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles;
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UrlController.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UrlController.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UrlController.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/UrlController.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
- * $Id$
+ * $Id$
*
- * Copyright 1999-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.struts.tiles;
@@ -31,63 +34,63 @@
*/
public class UrlController implements Controller {
- /**
- * URL associated with this controller.
- */
- protected String url = null;
-
- /**
- * Constructor.
- * @param url URL.
- */
- public UrlController(String url) {
- this.url = url;
- }
-
- /**
- * Method associated to a tile and called immediately before the tile
- * is included. This implementation calls an <code>Action</code>.
- * No servlet is set by this method.
- *
- * @param tileContext Current tile context.
- * @param request Current request.
- * @param response Current response.
- * @param servletContext Current servlet context.
- */
- public void perform(
- ComponentContext tileContext,
- HttpServletRequest request,
- HttpServletResponse response,
- ServletContext servletContext)
- throws ServletException, IOException {
-
- RequestDispatcher rd = servletContext.getRequestDispatcher(url);
- if (rd == null) {
- throw new ServletException(
- "Controller can't find url '" + url + "'.");
- }
-
- rd.include(request, response);
- }
-
- /**
- * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
- */
- public void execute(
- ComponentContext tileContext,
- HttpServletRequest request,
- HttpServletResponse response,
- ServletContext servletContext)
- throws Exception {
-
- RequestDispatcher rd = servletContext.getRequestDispatcher(url);
- if (rd == null) {
- throw new ServletException(
- "Controller can't find url '" + url + "'.");
- }
+ /**
+ * URL associated with this controller.
+ */
+ protected String url = null;
+
+ /**
+ * Constructor.
+ * @param url URL.
+ */
+ public UrlController(String url) {
+ this.url = url;
+ }
+
+ /**
+ * Method associated to a tile and called immediately before the tile
+ * is included. This implementation calls an <code>Action</code>.
+ * No servlet is set by this method.
+ *
+ * @param tileContext Current tile context.
+ * @param request Current request.
+ * @param response Current response.
+ * @param servletContext Current servlet context.
+ */
+ public void perform(
+ ComponentContext tileContext,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ ServletContext servletContext)
+ throws ServletException, IOException {
+
+ RequestDispatcher rd = servletContext.getRequestDispatcher(url);
+ if (rd == null) {
+ throw new ServletException(
+ "Controller can't find url '" + url + "'.");
+ }
+
+ rd.include(request, response);
+ }
+
+ /**
+ * @see org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+ */
+ public void execute(
+ ComponentContext tileContext,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ ServletContext servletContext)
+ throws Exception {
+
+ RequestDispatcher rd = servletContext.getRequestDispatcher(url);
+ if (rd == null) {
+ throw new ServletException(
+ "Controller can't find url '" + url + "'.");
+ }
- rd.include(request, response);
+ rd.include(request, response);
- }
+ }
}
Modified: struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java?view=diff&rev=471754&r1=471753&r2=471754
==============================================================================
--- struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java (original)
+++ struts/struts1/trunk/tiles/src/main/java/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java Mon Nov 6 06:55:09 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 1999-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.struts.tiles.actions;