You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by he...@apache.org on 2006/11/21 22:52:24 UTC
svn commit: r477914 [19/26] - in /jakarta/velocity/tools/trunk: ./ docs/
docs/generic/ docs/javadoc/ docs/javadoc/org/apache/velocity/tools/generic/
docs/javadoc/org/apache/velocity/tools/generic/log/
docs/javadoc/org/apache/velocity/tools/struts/ docs...
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogoffAction.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogoffAction.java?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogoffAction.java (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogoffAction.java Tue Nov 21 13:52:11 2006
@@ -1,21 +1,24 @@
+package examples.app3;
+
/*
- * Copyright 2003 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
+ * 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 examples.app3;
-
import java.io.IOException;
import java.util.Hashtable;
import java.util.Locale;
@@ -39,7 +42,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.3 $ $Date: 2004/02/20 12:42:50 $
+ * @version $Revision$ $Date$
*/
public final class LogoffAction extends Action
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogonAction.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogonAction.java?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogonAction.java (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogonAction.java Tue Nov 21 13:52:11 2006
@@ -1,21 +1,24 @@
+package examples.app3;
+
/*
- * Copyright 2003 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
+ * 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 examples.app3;
-
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -31,7 +34,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.4 $ $Date: 2004/03/12 19:41:11 $
+ * @version $Revision$ $Date$
*/
public final class LogonAction extends Action
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogonForm.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogonForm.java?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogonForm.java (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app3/LogonForm.java Tue Nov 21 13:52:11 2006
@@ -1,22 +1,24 @@
+package examples.app3;
+
/*
- * Copyright 2003 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
+ * 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 examples.app3;
-
-
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionErrors;
@@ -34,7 +36,7 @@
* </ul>
*
* @author Ted Husted
- * @version $Revision: 1.3 $ $Date: 2004/03/12 19:41:11 $
+ * @version $Revision$ $Date$
*/
public final class LogonForm extends ActionForm
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app4/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app4/ApplicationResources.properties?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app4/ApplicationResources.properties (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app4/ApplicationResources.properties Tue Nov 21 13:52:11 2006
@@ -1,3 +1,20 @@
+# 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.
+
# Tags for Struts demo app 3
errors.footer=</ul>
errors.header=You must correct the following error(s) before proceeding:<ul>
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app4/MyTileController.java
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app4/MyTileController.java?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app4/MyTileController.java (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app4/MyTileController.java Tue Nov 21 13:52:11 2006
@@ -1,22 +1,23 @@
+package examples.app4;
+
/*
- * 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
+ * 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.
- *
- * $Id$
+ * 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 examples.app4;
import org.apache.struts.tiles.ControllerSupport;
import org.apache.struts.tiles.ComponentContext;
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app5/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app5/ApplicationResources.properties?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app5/ApplicationResources.properties (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/src/examples/app5/ApplicationResources.properties Tue Nov 21 13:52:11 2006
@@ -1,3 +1,20 @@
+# 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.
+
# Tags for Struts demo app 5
errors.footer=</ul>
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<action-mappings>
<action path="/admin/addFormBean" type="org.apache.struts.actions.AddFormBeanAction" />
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<form-beans>
<form-bean name="addressForm" type="examples.app1.AddressForm" />
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<form-beans>
<form-bean name="demoForm" type="examples.app2.DemoForm" />
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<form-beans>
<form-bean name="logonForm" type="examples.app3.LogonForm" />
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app4-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app4-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app4-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app4-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<action-mappings>
<action forward=".frontpage" path="/index_vm" />
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<form-beans>
<form-bean name="emailForm" type="org.apache.struts.validator.DynaValidatorForm">
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<form-beans>
<form-bean name="testForm" type="org.apache.struts.action.DynaActionForm">
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app7-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app7-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app7-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app7-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<form-beans>
<form-bean name="testForm" type="org.apache.struts.action.DynaActionForm">
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-config.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-config.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-config.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+<!--
+ 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.
+-->
+
<struts-config>
<global-forwards>
<forward name="app1" path="/app1/address2.do" redirect="true" />
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml Tue Nov 21 13:52:11 2006
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" "http://struts.apache.org/dtds/tiles-config_1_1.dtd">
+
+<!--
+ 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.
+-->
+
<tiles-definitions>
<definition name=".common">
<put name="title" value="TilesTool Demo!" />
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml Tue Nov 21 13:52:11 2006
@@ -1,22 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" "http://struts.apache.org/dtds/tiles-config_1_1.dtd">
-<!--
- Copyright 2004-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
+<!--
+ 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
- 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.
+ http://www.apache.org/licenses/LICENSE-2.0
- $Id$
+ 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.
-->
+
<tiles-definitions>
<definition name=".common">
<put name="top" value="/app7/top.html" />
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/sslext.tld
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/sslext.tld?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/sslext.tld (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/sslext.tld Tue Nov 21 13:52:11 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
<taglib>
<tlibversion>1.0</tlibversion>
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-bean.tld
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-bean.tld?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-bean.tld (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-bean.tld Tue Nov 21 13:52:11 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-html.tld
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-html.tld?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-html.tld (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-html.tld Tue Nov 21 13:52:11 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-logic.tld
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-logic.tld?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-logic.tld (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-logic.tld Tue Nov 21 13:52:11 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-nested.tld
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-nested.tld?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-nested.tld (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-nested.tld Tue Nov 21 13:52:11 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-template.tld
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-template.tld?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-template.tld (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-template.tld Tue Nov 21 13:52:11 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-tiles.tld
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-tiles.tld?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-tiles.tld (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/tld/struts-tiles.tld Tue Nov 21 13:52:11 2006
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/toolbox.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/toolbox.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/toolbox.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/toolbox.xml Tue Nov 21 13:52:11 2006
@@ -1,21 +1,24 @@
<?xml version="1.0"?>
-<!--
- Copyright 2003-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
+<!--
+ 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
- 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.
+ http://www.apache.org/licenses/LICENSE-2.0
- $Id$
+ 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.
-->
+
<toolbox>
<tool>
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validation.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validation.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validation.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validation.xml Tue Nov 21 13:52:11 2006
@@ -1,23 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
"http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
-<!--
- Copyright 2005 The Apache Software Foundation.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+<!--
+ 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
- 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.
+ http://www.apache.org/licenses/LICENSE-2.0
- $Id$
+ 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.
-->
+
<form-validation>
<formset>
<form name="emailForm">
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validator-rules.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validator-rules.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validator-rules.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validator-rules.xml Tue Nov 21 13:52:11 2006
@@ -1,6 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE form-validation PUBLIC
"-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
"http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
+
+<!--
+ 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.
+-->
+
<!--
$Id$
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/velocity.properties?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/velocity.properties (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/velocity.properties Tue Nov 21 13:52:11 2006
@@ -1,39 +1,38 @@
-#*
- * Copyright 2003 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.
- *
- * $Id$
- *#
+# 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.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These are the default properties for the
# Velocity Runtime. These values are used when
# Runtime.init() is called, and when Runtime.init(properties)
# fails to find the specificed properties file.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# R U N T I M E L O G
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# Velocity uses the Servlet APIs logging facilites.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# This controls if Runtime.error(), info() and warn() messages include the
# whole stack trace. The last property controls whether invalid references
# are logged.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.log.error.stacktrace = false
runtime.log.warn.stacktrace = false
@@ -41,53 +40,53 @@
runtime.log.invalid.reference = true
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# T E M P L A T E E N C O D I N G
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
input.encoding=ISO-8859-1
output.encoding=ISO-8859-1
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# F O R E A C H P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These properties control how the counter is accessed in the #foreach
# directive. By default the reference $velocityCount will be available
# in the body of the #foreach directive. The default starting value
# for this reference is 1.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
directive.foreach.counter.name = velocityCount
directive.foreach.counter.initial.value = 1
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# I N C L U D E P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# These are the properties that governed the way #include'd content
# is governed.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
directive.include.output.errormsg.start = <!-- include error :
directive.include.output.errormsg.end = see error log -->
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# P A R S E P R O P E R T I E S
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
directive.parse.max.depth = 10
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# VELOCIMACRO PROPERTIES
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# global : name of default global library. It is expected to be in the regular
# template path. You may remove it (either the file or this property) if
# you wish with no harm.
-#----------------------------------------------------------------------------
-#dev-changes by Marino
+# ----------------------------------------------------------------------------
+# dev-changes by Marino
webapp.resource.loader.cache = true
webapp.resource.loader.modificationCheckInterval = 5
velocimacro.library.autoreload = false
@@ -99,20 +98,20 @@
velocimacro.context.localscope = false
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# INTERPOLATION
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# turn off and on interpolation of references and directives in string
# literals. ON by default :)
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
runtime.interpolate.string.literals = true
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# RESOURCE MANAGEMENT
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
# Allows alternative ResourceManager and ResourceCache implementations
# to be plugged in.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl
resource.manager.cache.class = org.apache.velocity.runtime.resource.ResourceCacheImpl
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/web.xml?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/web.xml (original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/web.xml Tue Nov 21 13:52:11 2006
@@ -1,22 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-<!--
- Copyright 2003 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
+<!--
+ 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
- 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.
+ http://www.apache.org/licenses/LICENSE-2.0
- $Id$
+ 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.
-->
+
<web-app>
<servlet>
<servlet-name>action</servlet-name>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp Tue Nov 21 13:52:11 2006
@@ -1,19 +1,20 @@
<%--
- * Copyright 2003-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.
- *
- * $Id$
+ 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.
--%>
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.txt
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.txt?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.txt (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.txt Tue Nov 21 13:52:11 2006
@@ -1,20 +1,20 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
+
<html>
<head>
<title>$text.get("title")</title>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.vm
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.vm?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.vm (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.vm Tue Nov 21 13:52:11 2006
@@ -1,20 +1,20 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
+
<html>
<head>
<title>$text.title</title>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/edit-addressjsp.txt
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app1/edit-addressjsp.txt?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/edit-addressjsp.txt (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/edit-addressjsp.txt Tue Nov 21 13:52:11 2006
@@ -1,20 +1,22 @@
<%--
- * Copyright 2003-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.
- *
- * $Id$
+ * 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.
--%>
+
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/show-address.jsp
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app1/show-address.jsp?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/show-address.jsp (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/show-address.jsp Tue Nov 21 13:52:11 2006
@@ -1,19 +1,20 @@
<%--
- * Copyright 2003-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.
- *
- * $Id$
+ 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.
--%>
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/show-address.txt
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app1/show-address.txt?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/show-address.txt (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/show-address.txt Tue Nov 21 13:52:11 2006
@@ -1,20 +1,20 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
+
<html>
<head>
<title>$text.get("title")</title>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/show-address.vm
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app1/show-address.vm?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/show-address.vm (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/show-address.vm Tue Nov 21 13:52:11 2006
@@ -1,20 +1,20 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
+
<html>
<head>
<title>$text.title</title>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/show-addressjsp.txt
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app1/show-addressjsp.txt?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/show-addressjsp.txt (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/show-addressjsp.txt Tue Nov 21 13:52:11 2006
@@ -1,20 +1,22 @@
<%--
- * Copyright 2003-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.
- *
- * $Id$
+ * 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.
--%>
+
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
Modified: jakarta/velocity/tools/trunk/examples/struts/app2/tool-demo.txt
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app2/tool-demo.txt?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app2/tool-demo.txt (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app2/tool-demo.txt Tue Nov 21 13:52:11 2006
@@ -1,20 +1,20 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
+
<html>
<head>
<title>Struts App2: Struts View Tools Demo</title>
Modified: jakarta/velocity/tools/trunk/examples/struts/app2/tool-demo.vm
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app2/tool-demo.vm?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app2/tool-demo.vm (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app2/tool-demo.vm Tue Nov 21 13:52:11 2006
@@ -1,20 +1,20 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
+
<html>
<head>
<title>Struts App2: Struts View Tools Demo</title>
Modified: jakarta/velocity/tools/trunk/examples/struts/app3/index.jsp
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app3/index.jsp?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app3/index.jsp (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app3/index.jsp Tue Nov 21 13:52:11 2006
@@ -1,19 +1,20 @@
<%--
- * Copyright 2003-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.
- *
- * $Id$
+ 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.
--%>
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
Modified: jakarta/velocity/tools/trunk/examples/struts/app3/index.vm
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app3/index.vm?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app3/index.vm (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app3/index.vm Tue Nov 21 13:52:11 2006
@@ -1,20 +1,19 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
#*
Modified: jakarta/velocity/tools/trunk/examples/struts/app3/index_jsp.txt
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app3/index_jsp.txt?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app3/index_jsp.txt (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app3/index_jsp.txt Tue Nov 21 13:52:11 2006
@@ -1,20 +1,22 @@
<%--
- * Copyright 2003-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.
- *
- * $Id$
+ * 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.
--%>
+
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
Modified: jakarta/velocity/tools/trunk/examples/struts/app3/index_vm.txt
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app3/index_vm.txt?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app3/index_vm.txt (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app3/index_vm.txt Tue Nov 21 13:52:11 2006
@@ -1,20 +1,19 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
#*
Modified: jakarta/velocity/tools/trunk/examples/struts/app3/logon.jsp
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app3/logon.jsp?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app3/logon.jsp (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app3/logon.jsp Tue Nov 21 13:52:11 2006
@@ -1,19 +1,20 @@
<%--
- * Copyright 2003-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.
- *
- * $Id$
+ 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.
--%>
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
Modified: jakarta/velocity/tools/trunk/examples/struts/app3/logon.vm
URL: http://svn.apache.org/viewvc/jakarta/velocity/tools/trunk/examples/struts/app3/logon.vm?view=diff&rev=477914&r1=477913&r2=477914
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app3/logon.vm (original)
+++ jakarta/velocity/tools/trunk/examples/struts/app3/logon.vm Tue Nov 21 13:52:11 2006
@@ -1,20 +1,20 @@
-#*
- * Copyright 2003-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.
- *
- * $Id$
- *#
+## 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.
+
<html>
<head>
<title>Sign in, Please!</title>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@velocity.apache.org
For additional commands, e-mail: dev-help@velocity.apache.org