You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ga...@apache.org on 2006/04/30 17:41:10 UTC

svn commit: r398359 - in /incubator/roller/trunk: contrib/plugins/src/org/roller/presentation/velocity/plugins/search/ contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/ src/org/roller/business/hibernate/ src/org/roller/config/ src/...

Author: gangolli
Date: Sun Apr 30 08:41:09 2006
New Revision: 398359

URL: http://svn.apache.org/viewcvs?rev=398359&view=rev
Log:
Revised header to conform to latest provided by Cliff Schmidt.  The new header no longer includes copyright notice, only refers to the NOTICE.TXT.  Added some missing author attributions (to myself) where my prior personal copyright notice had been serving a dual purpose as attribution.

Modified:
    incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java
    incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/SearchPluginBase.java
    incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java
    incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
    incubator/roller/trunk/src/org/roller/business/hibernate/HibernateAutoPingManagerImpl.java
    incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingQueueManagerImpl.java
    incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingTargetManagerImpl.java
    incubator/roller/trunk/src/org/roller/config/PingConfig.java
    incubator/roller/trunk/src/org/roller/model/AutoPingManager.java
    incubator/roller/trunk/src/org/roller/model/PingQueueManager.java
    incubator/roller/trunk/src/org/roller/model/PingTargetManager.java
    incubator/roller/trunk/src/org/roller/pojos/AutoPingData.java
    incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java
    incubator/roller/trunk/src/org/roller/pojos/PingQueueEntryData.java
    incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java
    incubator/roller/trunk/src/org/roller/presentation/filters/CharEncodingFilter.java
    incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueProcessor.java
    incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueTask.java
    incubator/roller/trunk/src/org/roller/presentation/pings/WeblogUpdatePinger.java
    incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
    incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java
    incubator/roller/trunk/src/org/roller/presentation/weblog/formbeans/PingSetupForm.java
    incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
    incubator/roller/trunk/src/org/roller/util/PropertyExpander.java
    incubator/roller/trunk/tests/org/roller/util/PropertyExpanderTest.java

Modified: incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/GoogleLinkPlugin.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.velocity.plugins.search;

Modified: incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/SearchPluginBase.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/SearchPluginBase.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/SearchPluginBase.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/SearchPluginBase.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.velocity.plugins.search;

Modified: incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/search/WikipediaLinkPlugin.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.velocity.plugins.search;

Modified: incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.velocity.plugins.topictag;

Modified: incubator/roller/trunk/src/org/roller/business/hibernate/HibernateAutoPingManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/hibernate/HibernateAutoPingManagerImpl.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/business/hibernate/HibernateAutoPingManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/roller/business/hibernate/HibernateAutoPingManagerImpl.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.business.hibernate;
@@ -39,6 +41,8 @@
 
 /**
  * Hibernate implementation of the AutoPingManager.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public class HibernateAutoPingManagerImpl implements AutoPingManager {
     

Modified: incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingQueueManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingQueueManagerImpl.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingQueueManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingQueueManagerImpl.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 
@@ -34,6 +36,8 @@
 
 /**
  * Hibernate implementation of the PingQueueManager.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public class HibernatePingQueueManagerImpl implements PingQueueManager {
     

Modified: incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingTargetManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingTargetManagerImpl.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingTargetManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/roller/business/hibernate/HibernatePingTargetManagerImpl.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.business.hibernate;
@@ -42,6 +44,8 @@
 
 /**
  * Hibernate implementation of the PingTargetManager.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public class HibernatePingTargetManagerImpl implements PingTargetManager {
     

Modified: incubator/roller/trunk/src/org/roller/config/PingConfig.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/config/PingConfig.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/config/PingConfig.java (original)
+++ incubator/roller/trunk/src/org/roller/config/PingConfig.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.config;
@@ -33,6 +35,8 @@
 /**
  * Thin wrapper around RollerConfig and RollerRuntimeConfig for centralizing access to the many configurable
  * settings for pings.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public class PingConfig
 {

Modified: incubator/roller/trunk/src/org/roller/model/AutoPingManager.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/model/AutoPingManager.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/model/AutoPingManager.java (original)
+++ incubator/roller/trunk/src/org/roller/model/AutoPingManager.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.model;

Modified: incubator/roller/trunk/src/org/roller/model/PingQueueManager.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/model/PingQueueManager.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/model/PingQueueManager.java (original)
+++ incubator/roller/trunk/src/org/roller/model/PingQueueManager.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.model;

Modified: incubator/roller/trunk/src/org/roller/model/PingTargetManager.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/model/PingTargetManager.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/model/PingTargetManager.java (original)
+++ incubator/roller/trunk/src/org/roller/model/PingTargetManager.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.model;
@@ -24,6 +26,8 @@
 
 /**
  * Manages ping targets.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public interface PingTargetManager {
     

Modified: incubator/roller/trunk/src/org/roller/pojos/AutoPingData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/AutoPingData.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/AutoPingData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/AutoPingData.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.pojos;
@@ -23,8 +25,8 @@
  * ping target should be pinged when the corresponding website is changed.  Pinging can be restricted to changes to
  * specific categories on the website by instances of the {@link PingCategoryRestrictionData} object.  In the absence of
  * any category restrictions, the ping target is pinged whenever the corresponding website changes.
- *
- * @author Anil Gangolli anil@busybuddha.org
+ * 
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @ejb:bean name="AutoPingData"
  * @hibernate.class lazy="false" table="autoping"
  * @hibernate.cache usage="read-write"

Modified: incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.pojos;
@@ -25,7 +27,7 @@
  * instances.  If no instances of this class are present for a given auto ping configuration, it means that the ping
  * configuration is not restricted by category, so pings should go out for changes in any category.
  *
- * @author Anil Gangolli anil@busybuddha.org
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @ejb:bean name="AutoPingData"
  * @hibernate.class lazy="false" table="pingcategory"
  * @hibernate.cache usage="read-write"

Modified: incubator/roller/trunk/src/org/roller/pojos/PingQueueEntryData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/PingQueueEntryData.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/PingQueueEntryData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/PingQueueEntryData.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.pojos;
@@ -24,7 +26,7 @@
  * added to the queue, which configuration to apply for the ping, and the number of ping attempts that have been made
  * for this entry so far.
  *
- * @author Anil Gangolli anil@busybuddha.org
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @ejb:bean name="PingQueueEntryData"
  * @hibernate.class lazy="false" table="pingqueueentry"
  * @hibernate.cache usage="read-write"

Modified: incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.pojos;
@@ -31,7 +33,7 @@
  * either common (defined centrally by an administrator and used by any website), or custom (defined by the user of a
  * specific website) for update pings issued for that website.
  *
- * @author Anil Gangolli anil@busybuddha.org
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @ejb:bean name="PingTargetData"
  * @struts.form include-all="true"
  * @hibernate.class lazy="false" table="pingtarget"

Modified: incubator/roller/trunk/src/org/roller/presentation/filters/CharEncodingFilter.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/CharEncodingFilter.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/filters/CharEncodingFilter.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/filters/CharEncodingFilter.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.filters;
@@ -38,7 +40,7 @@
  * processing forces request parsing using a default encoding.  It also syncs up the Struts and JSTL locales.  This
  * filter should normally be first and last in the chain.
  *
- * @author Anil Gangolli
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @web.filter name="CharEncodingFilter"
  */
 

Modified: incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueProcessor.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueProcessor.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueProcessor.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 
@@ -33,6 +35,8 @@
 
 /**
  * Ping Queue Processor.  Singleton encapsulating logic for processing the weblog update ping queue.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public class PingQueueProcessor
 {

Modified: incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueTask.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueTask.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueTask.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/pings/PingQueueTask.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.pings;
@@ -29,6 +31,8 @@
  * Task for processing the ping queue at fixed intervals.   This is set up during context initialization by {@link
  * RollerContext}.  The queue processing interval is currently set from the configuration {@link
  * org.roller.config.PingConfig} at startup time only.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public class PingQueueTask extends TimerTask
 {

Modified: incubator/roller/trunk/src/org/roller/presentation/pings/WeblogUpdatePinger.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/pings/WeblogUpdatePinger.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/pings/WeblogUpdatePinger.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/pings/WeblogUpdatePinger.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2004-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.pings;
@@ -34,7 +36,7 @@
 /**
  * Utility for sending a weblog update ping.
  *
- * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</author>
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @author llavandowska (for code refactored from the now-defunct <code>RollerXmlRpcClient</code>)
  */
 public class WeblogUpdatePinger

Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.weblog.actions;
@@ -41,6 +43,7 @@
 /**
  * Administer custom ping targets.
  *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @struts.action name="pingTargetForm" path="/editor/customPingTargets" scope="request" parameter="method"
  * @struts.action-forward name="pingTargets.page" path=".CustomPingTargets"
  * @struts.action-forward name="pingTargetEdit.page" path=".CustomPingTargetEdit"

Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/PingSetupAction.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.weblog.actions;
@@ -56,6 +58,7 @@
 /**
  * Actions for setting up automatic ping configuration for a weblog.
  *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @struts.action name="pingSetupForm" path="/editor/pingSetup" scope="request" parameter="method"
  * @struts.action-forward name="pingSetup.page" path=".Pings"
  * @struts.action-forward name="pingResult.page" path=".PingResult"

Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/formbeans/PingSetupForm.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/formbeans/PingSetupForm.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/formbeans/PingSetupForm.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/formbeans/PingSetupForm.java Sun Apr 30 08:41:09 2006
@@ -1,23 +1,30 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.weblog.formbeans;
 
 import org.apache.struts.action.ActionForm;
 
+/**
+ * Ping setup form.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
+ */
 public class PingSetupForm extends ActionForm
 {
     // Nothing yet.  Required for PingSetup action however.

Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.presentation.website.actions;
@@ -33,6 +35,7 @@
 /**
  * Administer common ping targets.
  *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  * @struts.action name="pingTargetForm" path="/admin/commonPingTargets" scope="request" parameter="method"
  * @struts.action-forward name="pingTargets.page" path=".CommonPingTargets"
  * @struts.action-forward name="pingTargetEdit.page" path=".CommonPingTargetEdit"

Modified: incubator/roller/trunk/src/org/roller/util/PropertyExpander.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/util/PropertyExpander.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/util/PropertyExpander.java (original)
+++ incubator/roller/trunk/src/org/roller/util/PropertyExpander.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.util;

Modified: incubator/roller/trunk/tests/org/roller/util/PropertyExpanderTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/util/PropertyExpanderTest.java?rev=398359&r1=398358&r2=398359&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/util/PropertyExpanderTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/util/PropertyExpanderTest.java Sun Apr 30 08:41:09 2006
@@ -1,17 +1,19 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  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.
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
  */
 
 package org.roller.util;
@@ -23,6 +25,8 @@
 
 /**
  * Unit test for org.roller.util.PropertyExpander.
+ *
+ * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */
 public class PropertyExpanderTest extends TestCase
 {