roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r414422 - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/ui/rendering/ src/org/apache/roller/ui/rendering/velocity/ web/WEB-INF/classes/
Date Thu, 15 Jun 2006 01:20:17 GMT
Author: agilliland
Date: Wed Jun 14 18:20:17 2006
New Revision: 414422

URL: http://svn.apache.org/viewvc?rev=414422&view=rev
Log:
move VelocityRendererFactory to ui.rendering.velocity where it belongs.  also added some apache
license files that were missing.


Added:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRendererFactory.java
      - copied, changed from r414421, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/VelocityRendererFactory.java
Removed:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/VelocityRendererFactory.java
Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityWeblogPageRenderer.java
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java?rev=414422&r1=414421&r2=414422&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java
Wed Jun 14 18:20:17 2006
@@ -1,3 +1,20 @@
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * 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.apache.roller.ui.rendering.velocity;
 

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRendererFactory.java
(from r414421, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/VelocityRendererFactory.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRendererFactory.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRendererFactory.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/VelocityRendererFactory.java&r1=414421&r2=414422&rev=414422&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/VelocityRendererFactory.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityRendererFactory.java
Wed Jun 14 18:20:17 2006
@@ -1,17 +1,39 @@
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * 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.apache.roller.ui.rendering;
+package org.apache.roller.ui.rendering.velocity;
 
-import org.apache.roller.ui.rendering.velocity.VelocityRenderer;
-import org.apache.roller.ui.rendering.velocity.VelocityWeblogPageRenderer;
+import org.apache.roller.ui.rendering.Renderer;
+import org.apache.roller.ui.rendering.RendererFactory;
 
 
 /**
- * The default RendererFactory for Roller.
+ * Velocity RendererFactory for Roller.
  */
 public class VelocityRendererFactory implements RendererFactory {
     
     
     public Renderer getRenderer(String rendererType, String resourceId) {
+        
+        // nothing we can do with null values
+        if(rendererType == null || resourceId == null) {
+            return null;
+        }
         
         if("velocity".equals(rendererType)) {
             

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityWeblogPageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityWeblogPageRenderer.java?rev=414422&r1=414421&r2=414422&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityWeblogPageRenderer.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/VelocityWeblogPageRenderer.java
Wed Jun 14 18:20:17 2006
@@ -1,3 +1,20 @@
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * 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.apache.roller.ui.rendering.velocity;
 

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties?rev=414422&r1=414421&r2=414422&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties Wed Jun 14
18:20:17 2006
@@ -79,7 +79,7 @@
 # Rendering system settings.
 
 # The set of default Roller renderer factories.
-rendering.rollerRendererFactories=org.apache.roller.ui.rendering.VelocityRendererFactory
+rendering.rollerRendererFactories=org.apache.roller.ui.rendering.velocity.VelocityRendererFactory
 
 # The set of user defined renderer factories.  This is added to the list above.
 rendering.userRendererFactories=



Mime
View raw message