turbine-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r615328 [8/18] - in /turbine/core/trunk: ./ conf/ conf/test/ extensions/maven-plugin/ extensions/maven-plugin/conf/ extensions/maven-plugin/src/plugin-resources/demo/templates/layouts/ extensions/maven-plugin/src/plugin-resources/demo/templ...
Date Fri, 25 Jan 2008 20:25:35 GMT
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/package.html
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/package.html?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/package.html (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/package.html Fri Jan 25 12:25:05 2008
@@ -1,3 +1,21 @@
+<!--
+ 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>
 <!-- head part is ignored -->

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/AvalonComponentService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/AvalonComponentService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/AvalonComponentService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/AvalonComponentService.java Fri Jan 25 12:25:05 2008
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.avaloncomponent;
 
 /*
- * Copyright 2001-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.
  */
 
 import org.apache.avalon.framework.service.ServiceManager;

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -242,7 +245,7 @@
             manager.release((Component)component);
         }
     }
-        
+
     /**
      * @see org.apache.avalon.framework.service.ServiceManager#hasService(java.lang.String)
      */
@@ -254,7 +257,7 @@
     // -------------------------------------------------------------
     // TurbineServiceProvider
     // -------------------------------------------------------------
-    
+
     /**
      * @see org.apache.turbine.services.TurbineServiceProvider#exists(java.lang.String)
      */
@@ -262,7 +265,7 @@
     {
         return this.hasService(roleName);
     }
-    
+
     /**
      * @see org.apache.turbine.services.TurbineServiceProvider#get(java.lang.String)
      */
@@ -283,6 +286,6 @@
             String msg = "Unable to get the following service : " + roleName;
             log.error(msg,t);
             throw new InstantiationException(msg,t);
-        }                
+        }
     }
 }

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java Fri Jan 25 12:25:05 2008
@@ -1,20 +1,22 @@
 package org.apache.turbine.services.avaloncomponent;
 
 /*
- * Copyright 2004 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
  *
- * 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.
  */
 
 import java.io.IOException;
@@ -61,7 +63,7 @@
 
     /** YAFFI container */
     private ServiceContainer container;
-    
+
     // -------------------------------------------------------------
     // Service initialization
     // -------------------------------------------------------------
@@ -126,14 +128,14 @@
 
         // create the configuration for YAAFI
 
-        ServiceContainerConfiguration config = 
+        ServiceContainerConfiguration config =
             this.createServiceContainerConfiguration(conf);
 
         config.setLogger( this.createAvalonLogger() );
         config.setApplicationRootDir( homePath );
 
         // initialize the container
-        
+
         try
         {
             this.container = ServiceContainerFactory.create(
@@ -145,7 +147,7 @@
             String msg = "Initializing YAAFI failed";
             log.error(msg,e);
             throw e;
-        }                
+        }
     }
 
     /**
@@ -189,7 +191,7 @@
     {
         return this.container.hasService(roleName);
     }
-    
+
     /**
      * Create a ServiceContainerConfiguration based on the Turbine configuration
      *
@@ -265,11 +267,11 @@
         Logger result = new CommonsLogger(log, AVALON_LOG_CATEGORY);
         return result;
     }
-    
+
     // -------------------------------------------------------------
     // TurbineServiceProvider
     // -------------------------------------------------------------
-    
+
     /**
      * @see org.apache.turbine.services.TurbineServiceProvider#exists(java.lang.String)
      */
@@ -277,7 +279,7 @@
     {
         return this.hasService(roleName);
     }
-    
+
     /**
      * @see org.apache.turbine.services.TurbineServiceProvider#get(java.lang.String)
      */
@@ -298,6 +300,6 @@
             String msg = "Unable to get the following service : " + roleName;
             log.error(msg,t);
             throw new InstantiationException(msg,t);
-        }        
+        }
     }
-}
\ No newline at end of file
+}

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/package.html
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/package.html?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/package.html (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/package.html Fri Jan 25 12:25:05 2008
@@ -1,3 +1,21 @@
+<!--
+ 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>
 <!-- head part is ignored -->

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -63,7 +66,7 @@
 
     /** ValueParser instance */
     private ValueParser pp;
-  
+
     HashMap declaredGroups = new HashMap();
     StringBuffer allGroupsSB = new StringBuffer(256);
     StringBuffer groupSB = new StringBuffer(128);
@@ -313,7 +316,7 @@
                     g = Intake.getGroup(groupName);
                     groups.put(inputKey, g);
                 }
-                
+
                 return g.init(obj);
             }
             catch (Exception e)
@@ -323,7 +326,7 @@
 
             return null;
         }
-    }    
+    }
 
     /**
      * get a specific group
@@ -427,7 +430,7 @@
                 }
 		    }
 
-            
+
             try
             {
                 Intake.releaseGroup(group);

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/JspService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/JspService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/JspService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/JspService.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJsp.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJsp.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJsp.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJsp.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -56,7 +59,7 @@
         getService().addDefaultObjects(data);
     }
 
-    
+
     /**
      * Adds some convenience objects to the request.  For example an instance
      * of JspLink which can be used to generate links to other templates.
@@ -137,7 +140,7 @@
         handleRequest((RunData)pipelineData, templateName);
     }
 
-    
+
     /**
      * Returns the default buffer size of the JspService
      *

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/package.html
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/package.html?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/package.html (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/package.html Fri Jan 25 12:25:05 2008
@@ -1,10 +1,28 @@
+<!--
+ 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>
 <!-- head part is ignored -->
 </head>
 
 <body>
-JSP Service is used to provide Turbine with a Java Server page (JSP) based view. 
+JSP Service is used to provide Turbine with a Java Server page (JSP) based view.
 <br>
 <font size="-2">$Id$</font>
 </body>

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java Fri Jan 25 12:25:05 2008
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.localization;
 
 /*
- * Copyright 2001-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.
  */
 
 import java.util.Locale;
@@ -46,7 +49,7 @@
      * <code>Accept-Language</code> header.  Reset on each request.
      */
     protected Locale locale;
-    
+
     /**
      * Lazy load the LocalizationService.
      * @return a fulcrum LocalizationService

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/naming/NamingService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/naming/NamingService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/naming/NamingService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/naming/NamingService.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/naming/TurbineNamingService.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/naming/package.html
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/naming/package.html?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/naming/package.html (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/naming/package.html Fri Jan 25 12:25:05 2008
@@ -1,3 +1,21 @@
+<!--
+ 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>
 <!-- head part is ignored -->

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/package.html
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/package.html?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/package.html (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/package.html Fri Jan 25 12:25:05 2008
@@ -1,3 +1,21 @@
+<!--
+ 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>
 <!-- head part is ignored -->
@@ -13,7 +31,7 @@
 
 <h3>What is a service?</h3>
 <ul>
-<li> Is a singleton -  there is only one instance of it in the system 
+<li> Is a singleton -  there is only one instance of it in the system
      i.e. memory or connections are allocated once only, and the internal
      state is common to all requesting clients.
 <li> Has pluggable implementation - you can use your own implementation
@@ -26,24 +44,24 @@
 <li> Can initialize itself (allocate memory, make connctions)
      just before the client requests it for the first time. Services that
      are never used by the application will not allocate resources.
-<li> Can execute some action upon system shutdown e.g. close the 
+<li> Can execute some action upon system shutdown e.g. close the
      opened connections.
-</ul>		  
+</ul>
 <h3>The life cycle of a Service</h3>
 <p>
-A Service (or any other Initable, if we had any) is not supposed 
+A Service (or any other Initable, if we had any) is not supposed
 to do much in it's constructor. Especialy it should not allocate
 any costly resources like large memory structures, DB or network
 connections and the like. It may well happen that the Service
-is sitting in the config file, but the application does not 
+is sitting in the config file, but the application does not
 need it, so allocating all resources at system startup might
 be a loss.
 <p>
 Early initialization is similar to the constructor. It is used
 to pass some information that the Service will need in it's
-future operation. 
+future operation.
 UniqueId Service uses the HttpRequest object from the first Turbine
-invocation to determine URL this instance is runnign under, to 
+invocation to determine URL this instance is runnign under, to
 generate instance ID.
 Early initialization method should process the configuration, store
 some values, but NOT allocate resources. There is still a chance
@@ -56,13 +74,13 @@
 Late initialization happens when the Service is requested by the
 application for the first time. It should allocate any resources
 needed and chnge the state so that getInit() returns true.
-If getInit() returns false after init() is executed, the Service 
+If getInit() returns false after init() is executed, the Service
 has malfunctioned.
 <p>
 After late initialization, the Service is ready to perform actions
 on behalf of the application.
 <p>
-When the Service is no longer needed (this usually happens when 
+When the Service is no longer needed (this usually happens when
 system is shutting down), the shutdown() method is called.
 shutdown() should deallocate all resources. If any error conditions
 occur they are ignored.

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/ApplicationTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/ApplicationTool.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/ApplicationTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/ApplicationTool.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java Fri Jan 25 12:25:05 2008
@@ -1,19 +1,22 @@
 package org.apache.turbine.services.pull;
 
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 import org.apache.turbine.pipeline.PipelineData;
@@ -21,9 +24,9 @@
 
 /**
  * Interface for tools to be init'd and refreshed using a PipelineData
- * object 
- * Code largely taken from ApplicationTool. 
- * 
+ * object
+ * Code largely taken from ApplicationTool.
+ *
  * @author <a href="mailto:peter@courcoux.biz">Peter Courcoux</a>
  */
 public interface PipelineDataApplicationTool {
@@ -61,5 +64,5 @@
      */
     public void refresh(PipelineData data);
 
-    
+
 }

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/PullService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/PullService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/PullService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/PullService.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePull.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePull.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePull.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePull.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -54,7 +57,7 @@
      * Get the context containing global tools that will be
      * use as part of the Turbine Pull Model.
      *
-     * @return A Context object which contains the 
+     * @return A Context object which contains the
      *         Global Tool instances.
      */
     public static final Context getGlobalContext()
@@ -114,7 +117,7 @@
     {
         getService().populateContext(context, pipelineData);
     }
-    
+
     /**
      * Populate the given context with all request, session
      * and persistent scope tools (it is assumed that the context

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -302,7 +305,7 @@
 
         // Create and populate the global context right now
 
-        // This is unholy, because it entwines the VelocityService and 
+        // This is unholy, because it entwines the VelocityService and
         // the Pull Service even further. However, there isn't much we can
         // do for the 2.3 release. Expect this to go post-2.3
         globalContext = velocity.getNewContext();
@@ -453,8 +456,8 @@
                 populateWithPermTools(persistentTools, context, pipelineData, user);
             }
         }
-    }    
-    
+    }
+
     /**
      * Populate the given context with the global tools
      *
@@ -516,7 +519,7 @@
         }
     }
 
-    
+
     /**
      * Populate the given context with the request-scope tools
      *
@@ -723,8 +726,8 @@
         }
     }
 
-    
-    
+
+
     /**
      * Populate the given context with the perm-scoped tools.
      *
@@ -891,8 +894,8 @@
         }
     }
 
-    
-    
+
+
     /**
      * Return the absolute path to the resources directory
      * used by the application tools.
@@ -1004,7 +1007,7 @@
                 RunData data = getRunData((PipelineData)param);
                 ((ApplicationTool) tool).init(data);
             }
-        } 
+        }
         else
         {
             if (tool instanceof PipelineDataApplicationTool)
@@ -1050,7 +1053,7 @@
             ((RunDataApplicationTool) tool).refresh(data);
         }
     }
-    
+
     private RunData getRunData(PipelineData pipelineData)
     {
         if(!(pipelineData instanceof RunData)){

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/package.html
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/package.html?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/package.html (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/package.html Fri Jan 25 12:25:05 2008
@@ -1,3 +1,21 @@
+<!--
+ 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>
 <!-- head part is ignored -->

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/ContentTool.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -30,7 +33,7 @@
 /**
  * Terribly simple tool to translate URIs into Turbine Links.
  * Equivalent to URIUtils.getAbsoluteLink() in a pull tool.
- * 
+ *
  * <p>
  * If you're missing any routines from the 'old' $content tool concerning
  * path_info or query data, you did use the wrong tool then. You should've used
@@ -51,7 +54,7 @@
     /** Prefix for Parameters for this tool */
     public static final String CONTENT_TOOL_PREFIX = "tool.content";
 
-    /** 
+    /**
      * Should this tool add Container Encoding to the URIs returned?
      * True might cause trouble e.g. if you run with Apache HTTP Daemon / Tomcat Combo.
      *
@@ -61,7 +64,7 @@
 
     /** Default Value for CONTENT_TOOL_ENCODING_KEY */
     public static final boolean CONTENT_TOOL_ENCODING_DEFAULT = false;
-    
+
     /** Should this tool return relative URIs or absolute? Default: Absolute. */
     public static final String CONTENT_TOOL_RELATIVE_KEY = "want.relative";
 
@@ -70,13 +73,13 @@
 
     /** Do we want the container to encode the response? */
     boolean wantEncoding = false;
-    
+
     /** Do we want a relative link? */
     boolean wantRelative = false;
-    
+
     /** Caches a DataURI object which provides the translation routines */
     private DataURI dataURI = null;
-    
+
     /**
      * C'tor
      */
@@ -117,7 +120,7 @@
 
         }
 
-        Configuration conf = 
+        Configuration conf =
                 Turbine.getConfiguration().subset(CONTENT_TOOL_PREFIX);
 
         if (conf != null)
@@ -128,7 +131,7 @@
             wantEncoding = conf.getBoolean(CONTENT_TOOL_ENCODING_KEY,
                     CONTENT_TOOL_ENCODING_DEFAULT);
         }
-        
+
         if (!wantEncoding)
         {
             dataURI.clearResponse();
@@ -154,7 +157,7 @@
     {
         dataURI.setScriptName(path);
 
-        return wantRelative ? 
+        return wantRelative ?
                 dataURI.getRelativeLink() : dataURI.getAbsoluteLink();
     }
 

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java Fri Jan 25 12:25:05 2008
@@ -2,29 +2,32 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
 import org.apache.turbine.services.pull.ApplicationTool;
 
 /**
- * This is exactly the same thing as TemplateLink but it returns a 
+ * This is exactly the same thing as TemplateLink but it returns a
  * relative link on toString(). Everything else is identical. This class is
  * here for legacy purposes if you used the old org.apache.turbine.util.template.RelativeLink
- * class and have lots of templates which you don't want to rewrite. 
+ * class and have lots of templates which you don't want to rewrite.
  *
  * <p>
  * For new Code please use TemplateLink and get a relative Link with $link.RelativeLink and
@@ -56,9 +59,9 @@
     {
         super();
     }
-    
+
     /**
-     * Returns the URI. After rendering the URI, it clears the 
+     * Returns the URI. After rendering the URI, it clears the
      * pathInfo and QueryString portions of the TemplateURI. Equivalent
      * to the getRelativeLink() method of this class.
      *

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -70,7 +73,7 @@
 
     /** Do we want a relative link? */
     boolean wantRelative = false;
-        
+
     /** cache of the template name for getPage() */
     private String template = null;
 
@@ -121,7 +124,7 @@
             templateURI = new TemplateURI((RunData) data);
         }
 
-        Configuration conf = 
+        Configuration conf =
                 Turbine.getConfiguration().subset(TEMPLATE_LINK_PREFIX);
 
         if (conf != null)
@@ -547,14 +550,14 @@
 
     /**
      * Returns the URI. After rendering the URI, it clears the
-     * pathInfo and QueryString portions of the TemplateURI. 
+     * pathInfo and QueryString portions of the TemplateURI.
      *
      * @return A String with the URI in the form
      * http://foo.com/Turbine/template/index.wm/hello/world
      */
     public String getLink()
     {
-        return wantRelative ? 
+        return wantRelative ?
                 getRelativeLink() : getAbsoluteLink();
     }
 
@@ -576,7 +579,7 @@
     /**
      * Returns the absolute URI leaving the source intact. Use this
      * if you need the path_info and query data multiple times.
-     * This is equivalent to $link.AbsoluteLink but does not reset 
+     * This is equivalent to $link.AbsoluteLink but does not reset
      * the path_info and query data.
      *
      * @return A String with the URI in the form
@@ -605,7 +608,7 @@
      * Same as getLink().
      *
      * @return A String with the URI represented by this object.
-     * 
+     *
      */
     public String toString()
     {

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java Fri Jan 25 12:25:05 2008
@@ -2,31 +2,34 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
 import org.apache.turbine.services.pull.ApplicationTool;
 
 /**
- * This class allows one to specify paths in the setPage method 
+ * This class allows one to specify paths in the setPage method
  * using '/' slash as opposed to the ',' used in TemplateLink.
  * It is less efficient as the '/' are converted to ',' to avoid
- * problems parsing the pathinfo after conversion in a web server. 
- * 
- * It is recommended that projects standardize on using the ',' 
+ * problems parsing the pathinfo after conversion in a web server.
+ *
+ * It is recommended that projects standardize on using the ','
  * separator and use TemplateLink.  But this class is available for
  * those who do not mind the inefficiency.
  *
@@ -54,7 +57,7 @@
     {
         super();
     }
-    
+
     /**
      * Sets the template variable used by the Template Service.
      * This method allows slashes '/' as the path separator.

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/package.html
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/package.html?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/package.html (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/package.html Fri Jan 25 12:25:05 2008
@@ -1,3 +1,21 @@
+<!--
+ 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>
 <!-- head part is ignored -->

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -42,7 +45,7 @@
     private static final String DATE_FORMAT_DEFAULT = "MM/dd/yyyy";
 
     /**
-     * Property tag for the date format that is to be used for the web 
+     * Property tag for the date format that is to be used for the web
      * application.
      */
     private static final String DATE_FORMAT_KEY = "tool.dateTool.format";

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/SessionData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/SessionData.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/SessionData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/SessionData.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/UIManager.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/UIManager.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/UIManager.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/UIManager.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 
@@ -86,7 +89,7 @@
      * The disposed flag.
      */
     private boolean disposed;
-    
+
     /** The default locale. */
     private static Locale defaultLocale = null;
 
@@ -299,7 +302,7 @@
         }
 
         String charset = defaultCharSet;
-        
+
         if (StringUtils.isEmpty(charset))
         {
             log.debug("charset is empty!");
@@ -423,7 +426,7 @@
         if ((this.cookies != null) &&
                 (this.cookies.getRequest() != getRequest()))
         {
-            this.cookies.setData(getRequest(), getResponse());            
+            this.cookies.setData(getRequest(), getResponse());
         }
         return this.cookies;
     }
@@ -518,7 +521,7 @@
     public Document getPage()
     {
         pageSet = true;
-        if (this.page == null) 
+        if (this.page == null)
         {
             this.page = new Document();
         }
@@ -1503,7 +1506,7 @@
     {
         getServerData().setScriptName(scriptName);
     }
- 
+
     /**
      * Checks whether the object is disposed.
      *
@@ -1512,6 +1515,6 @@
     public boolean isDisposed()
     {
         return disposed;
-    }    
-    
+    }
+
 }

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/RunDataService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/RunDataService.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/RunDataService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/RunDataService.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
 
 
 /*
- * Copyright 2001-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.
  */
 
 



Mime
View raw message