incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r448311 [5/25] - in /incubator/graffito/trunk: ./ api/ api/src/java/org/apache/portals/graffito/context/ api/src/java/org/apache/portals/graffito/exception/ api/src/java/org/apache/portals/graffito/services/core/ api/src/java/org/apache/por...
Date Wed, 20 Sep 2006 19:37:21 GMT
Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/web.xml?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/web.xml (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/web.xml Wed Sep 20 12:37:05 2006
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-	<display-name>Graffito Browser</display-name>
-	<description>Graffito Browser Application</description>
-	<servlet>
-		<servlet-name>JetspeedContainer</servlet-name>
-		<display-name>Jetspeed Container</display-name>
-		<description>MVC Servlet for Jetspeed Portlet Applications</description>
-		<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-	</servlet>
-	
-	<!-- Define Velocity Servlet -->
-	<servlet>
-		<servlet-name>velocity</servlet-name>
-		<servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
-		<init-param>
-			<param-name>org.apache.velocity.toolbox</param-name>
-			<param-value>/WEB-INF/velocity/toolbox.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>org.apache.velocity.properties</param-name>
-			<param-value>/WEB-INF/velocity/velocity.properties</param-value>
-		</init-param>
-		<load-on-startup>10</load-on-startup>
-	</servlet>
-	<!-- Define Velocity Servlet -->
-	<servlet>
-		<servlet-name>viewer</servlet-name>
-		<servlet-class>org.apache.portals.graffito.servlets.GraffitoViewerServlet</servlet-class>
-		<load-on-startup>10</load-on-startup>
-	</servlet>
-	<!-- Map *.vm files to Velocity  -->
-	<servlet-mapping>
-		<servlet-name>velocity</servlet-name>
-		<url-pattern>*.vm</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>viewer</servlet-name>
-		<url-pattern>/viewer</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name> JetspeedContainer </servlet-name>
-		<url-pattern> /container/* </url-pattern>
-	</servlet-mapping>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+	<display-name>Graffito Browser</display-name>
+	<description>Graffito Browser Application</description>
+	<servlet>
+		<servlet-name>JetspeedContainer</servlet-name>
+		<display-name>Jetspeed Container</display-name>
+		<description>MVC Servlet for Jetspeed Portlet Applications</description>
+		<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+	</servlet>
+	
+	<!-- Define Velocity Servlet -->
+	<servlet>
+		<servlet-name>velocity</servlet-name>
+		<servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
+		<init-param>
+			<param-name>org.apache.velocity.toolbox</param-name>
+			<param-value>/WEB-INF/velocity/toolbox.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>org.apache.velocity.properties</param-name>
+			<param-value>/WEB-INF/velocity/velocity.properties</param-value>
+		</init-param>
+		<load-on-startup>10</load-on-startup>
+	</servlet>
+	<!-- Define Velocity Servlet -->
+	<servlet>
+		<servlet-name>viewer</servlet-name>
+		<servlet-class>org.apache.portals.graffito.servlets.GraffitoViewerServlet</servlet-class>
+		<load-on-startup>10</load-on-startup>
+	</servlet>
+	<!-- Map *.vm files to Velocity  -->
+	<servlet-mapping>
+		<servlet-name>velocity</servlet-name>
+		<url-pattern>*.vm</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>viewer</servlet-name>
+		<url-pattern>/viewer</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name> JetspeedContainer </servlet-name>
+		<url-pattern> /container/* </url-pattern>
+	</servlet-mapping>
 </web-app>

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/kupu/kupudrawers/allimages.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/kupu/kupudrawers/imagelibrary.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/kupu/kupudrawers/kupubuttons.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/kupu/kupudrawers/linklibrary.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/kupu/kupudrawers/logos.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/kupu/kupudrawerstyles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/browser/src/webapp/kupu/kupustyles.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/framework-portlets/project.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/framework-portlets/project.xml?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/framework-portlets/project.xml (original)
+++ incubator/graffito/trunk/applications/framework-portlets/project.xml Wed Sep 20 12:37:05 2006
@@ -1,231 +1,231 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-  $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
--->
-<project>
-  <extend>${basedir}/./../../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <artifactId>graffito-framework-portlets</artifactId>
-  <name>Graffito Framework Portlet</name>
-  <groupId>org.apache.portals.graffito</groupId>
-  <description>Graffito Framework Portlet</description>
-  <shortDescription>Graffito Framework Portlet</shortDescription>
-  <repository>
-    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/applications/framework-portlets</connection>
-    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/applications/framework-portlets</developerConnection>
-    <url>http://svn.apache.org/viewcvs</url>
-  </repository>
-  <dependencies>
-  	<dependency>
-		<id>servletapi</id>
-		<version>${servlet.api.version}</version>
-		<properties>
-			<war.bundle>false</war.bundle>
-		</properties>
-	</dependency>
-	<dependency>
-		<groupId>portlet-api</groupId>
-		<artifactId>portlet-api</artifactId>
-		<version>${portlet.api.version}</version>
-		<type>jar</type>
-		<properties>
-			<war.bundle>false</war.bundle>
-		</properties>
-	</dependency>
-	<dependency>
-		<groupId>org.apache.portals.jetspeed-2</groupId>
-		<artifactId>jetspeed-api</artifactId>
-		<version>${jetspeed.version}</version>
-		<type>jar</type>
-		<properties>
-			<war.bundle>false</war.bundle>
-		</properties>
-	</dependency>
-		
-	<dependency>
-		<groupId>org.apache.portals.jetspeed-2</groupId>
-		<artifactId>jetspeed-commons</artifactId>
-		<version>${jetspeed.version}</version>
-		<type>jar</type>
-		<properties>
-			<war.bundle>false</war.bundle>
-		</properties>
-	</dependency>
-	<dependency>
-		<groupId>org.apache.portals.jetspeed-2</groupId>
-		<artifactId>jetspeed-components</artifactId>
-		<version>${jetspeed.version}</version>
-		<type>jar</type>
-		<properties>
-			<war.bundle>true</war.bundle>
-		</properties>
-	</dependency>
-  
-    	<dependency>
-      		<groupId>log4j</groupId>
-      		<artifactId>log4j</artifactId>
-      		<version>${log4j.version}</version>
-      		<type>jar</type>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>commons-logging</groupId>
-      		<artifactId>commons-logging</artifactId>
-      		<version>${commons.logging.version}</version>
-      		<type>jar</type>
-      		<url>http://jakarta.apache.org/commons/logging.html</url>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>commons-beanutils</groupId>
-      		<artifactId>commons-beanutils</artifactId>
-		<version>${commons.beanutils.version}</version>
-      		<type>jar</type>
-      		<url>http://jakarta.apache.org/commons/beanutils.html</url>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>commons-codec</groupId>
-      		<artifactId>commons-codec</artifactId>
-      		<version>${commons.codec.version}</version>
-      		<type>jar</type>
-      		<url>http://jakarta.apache.org/commons/codec/</url>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>commons-collections</groupId>
-      		<artifactId>commons-collections</artifactId>
-      		<version>${commons.collections.version}</version>
-      		<type>jar</type>
-      		<url>http://jakarta.apache.org/commons/collections.html</url>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>commons-digester</groupId>
-      		<artifactId>commons-digester</artifactId>
-		<version>${commons.digester.version}</version>
-      		<type>jar</type>
-      		<url>http://jakarta.apache.org/commons/digester.html</url>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>commons-fileupload</groupId>
-      		<artifactId>commons-fileupload</artifactId>
-      		<version>${commons.fileupload.version}</version>
-      		<type>jar</type>
-      		<url>http://jakarta.apache.org/commons/fileupload/</url>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>commons-jexl</groupId>
-      		<artifactId>commons-jexl</artifactId>
-      		<version>${commons.jexl.version}</version>
-      		<type>jar</type>    
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>    
-    	<dependency>
-      		<groupId>velocity</groupId>
-      		<artifactId>velocity</artifactId>
-      		<version>${velocity.version}</version>
-      		<type>jar</type>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>velocity-tools</groupId>
-      		<artifactId>velocity-tools</artifactId>
-      		<version>${velocity.tools.version}</version>
-      		<type>jar</type>
-      		<url>http://jakarta.apache.org/velocity</url>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>org.apache.portals.bridges</groupId>
-      		<artifactId>portals-bridges-common</artifactId>
-      		<version>${portals.bridges.common.version}</version>
-      		<type>jar</type>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>org.apache.portals.bridges</groupId>
-      		<artifactId>portals-bridges-velocity</artifactId>
-      		<version>${portals.bridges.velocity.version}</version>
-      		<type>jar</type>
-      		<properties>
-        		<war.bundle>true</war.bundle>
-      		</properties>
-    	</dependency>
-    	<dependency>
-      		<groupId>org.apache.portals.graffito</groupId>
-      		<artifactId>graffito-api</artifactId>
-		<version>${graffito.version}</version>
-      		<type>jar</type>
-   	</dependency>
-  
-   </dependencies>
-    <build>
-    <sourceDirectory>src/java</sourceDirectory>
-
-    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-    <unitTest>
-      <resources>
-        <resource>
-          <directory>${basedir}/src/test</directory>
-          <excludes>
-           <exclude>**/*.java</exclude>
-          </excludes>
-        </resource>
-      </resources>
-    </unitTest>
-    
-    <resources>
-      <resource>
-        <directory>${basedir}/src/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
-  </build>
-  <reports>
-       <report>maven-javadoc-plugin</report>
-  </reports>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+  $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
+-->
+<project>
+  <extend>${basedir}/./../../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <artifactId>graffito-framework-portlets</artifactId>
+  <name>Graffito Framework Portlet</name>
+  <groupId>org.apache.portals.graffito</groupId>
+  <description>Graffito Framework Portlet</description>
+  <shortDescription>Graffito Framework Portlet</shortDescription>
+  <repository>
+    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/applications/framework-portlets</connection>
+    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/applications/framework-portlets</developerConnection>
+    <url>http://svn.apache.org/viewcvs</url>
+  </repository>
+  <dependencies>
+  	<dependency>
+		<id>servletapi</id>
+		<version>${servlet.api.version}</version>
+		<properties>
+			<war.bundle>false</war.bundle>
+		</properties>
+	</dependency>
+	<dependency>
+		<groupId>portlet-api</groupId>
+		<artifactId>portlet-api</artifactId>
+		<version>${portlet.api.version}</version>
+		<type>jar</type>
+		<properties>
+			<war.bundle>false</war.bundle>
+		</properties>
+	</dependency>
+	<dependency>
+		<groupId>org.apache.portals.jetspeed-2</groupId>
+		<artifactId>jetspeed-api</artifactId>
+		<version>${jetspeed.version}</version>
+		<type>jar</type>
+		<properties>
+			<war.bundle>false</war.bundle>
+		</properties>
+	</dependency>
+		
+	<dependency>
+		<groupId>org.apache.portals.jetspeed-2</groupId>
+		<artifactId>jetspeed-commons</artifactId>
+		<version>${jetspeed.version}</version>
+		<type>jar</type>
+		<properties>
+			<war.bundle>false</war.bundle>
+		</properties>
+	</dependency>
+	<dependency>
+		<groupId>org.apache.portals.jetspeed-2</groupId>
+		<artifactId>jetspeed-components</artifactId>
+		<version>${jetspeed.version}</version>
+		<type>jar</type>
+		<properties>
+			<war.bundle>true</war.bundle>
+		</properties>
+	</dependency>
+  
+    	<dependency>
+      		<groupId>log4j</groupId>
+      		<artifactId>log4j</artifactId>
+      		<version>${log4j.version}</version>
+      		<type>jar</type>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>commons-logging</groupId>
+      		<artifactId>commons-logging</artifactId>
+      		<version>${commons.logging.version}</version>
+      		<type>jar</type>
+      		<url>http://jakarta.apache.org/commons/logging.html</url>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>commons-beanutils</groupId>
+      		<artifactId>commons-beanutils</artifactId>
+		<version>${commons.beanutils.version}</version>
+      		<type>jar</type>
+      		<url>http://jakarta.apache.org/commons/beanutils.html</url>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>commons-codec</groupId>
+      		<artifactId>commons-codec</artifactId>
+      		<version>${commons.codec.version}</version>
+      		<type>jar</type>
+      		<url>http://jakarta.apache.org/commons/codec/</url>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>commons-collections</groupId>
+      		<artifactId>commons-collections</artifactId>
+      		<version>${commons.collections.version}</version>
+      		<type>jar</type>
+      		<url>http://jakarta.apache.org/commons/collections.html</url>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>commons-digester</groupId>
+      		<artifactId>commons-digester</artifactId>
+		<version>${commons.digester.version}</version>
+      		<type>jar</type>
+      		<url>http://jakarta.apache.org/commons/digester.html</url>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>commons-fileupload</groupId>
+      		<artifactId>commons-fileupload</artifactId>
+      		<version>${commons.fileupload.version}</version>
+      		<type>jar</type>
+      		<url>http://jakarta.apache.org/commons/fileupload/</url>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>commons-jexl</groupId>
+      		<artifactId>commons-jexl</artifactId>
+      		<version>${commons.jexl.version}</version>
+      		<type>jar</type>    
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>    
+    	<dependency>
+      		<groupId>velocity</groupId>
+      		<artifactId>velocity</artifactId>
+      		<version>${velocity.version}</version>
+      		<type>jar</type>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>velocity-tools</groupId>
+      		<artifactId>velocity-tools</artifactId>
+      		<version>${velocity.tools.version}</version>
+      		<type>jar</type>
+      		<url>http://jakarta.apache.org/velocity</url>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>org.apache.portals.bridges</groupId>
+      		<artifactId>portals-bridges-common</artifactId>
+      		<version>${portals.bridges.common.version}</version>
+      		<type>jar</type>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>org.apache.portals.bridges</groupId>
+      		<artifactId>portals-bridges-velocity</artifactId>
+      		<version>${portals.bridges.velocity.version}</version>
+      		<type>jar</type>
+      		<properties>
+        		<war.bundle>true</war.bundle>
+      		</properties>
+    	</dependency>
+    	<dependency>
+      		<groupId>org.apache.portals.graffito</groupId>
+      		<artifactId>graffito-api</artifactId>
+		<version>${graffito.version}</version>
+      		<type>jar</type>
+   	</dependency>
+  
+   </dependencies>
+    <build>
+    <sourceDirectory>src/java</sourceDirectory>
+
+    <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+    <unitTest>
+      <resources>
+        <resource>
+          <directory>${basedir}/src/test</directory>
+          <excludes>
+           <exclude>**/*.java</exclude>
+          </excludes>
+        </resource>
+      </resources>
+    </unitTest>
+    
+    <resources>
+      <resource>
+        <directory>${basedir}/src/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+
+  </build>
+  <reports>
+       <report>maven-javadoc-plugin</report>
+  </reports>
+</project>
+

Propchange: incubator/graffito/trunk/applications/framework-portlets/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/GraffitoPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/bean/BeanUtil.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/bean/BeanUtil.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/bean/BeanUtil.java (original)
+++ incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/bean/BeanUtil.java Wed Sep 20 12:37:05 2006
@@ -1,65 +1,65 @@
-/*
- * Copyright 2000-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.
- */
-package org.apache.portals.graffito.portlets.bean;
-
-
-import java.util.Enumeration;
-
-import javax.portlet.PortletRequest;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.PropertyUtils;
-
-/**
- * Utility class used to manage java beans
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class BeanUtil
-{
-     /**
-      * Update bean properties with the value found in the portlet request paramters
-      * 
-      * @param portletRequest
-      * @param bean The bean to update
-      * @return The updated bean
-      */
-     public static Object populate(PortletRequest portletRequest, Object bean)
-     {
-         Enumeration parameterNames = portletRequest.getParameterNames();
-         while(parameterNames.hasMoreElements())
-         {
-             String parameterName = (String) parameterNames.nextElement();
-             String parameterValue = portletRequest.getParameter(parameterName);
-             
-            try
-            {
-                PropertyUtils.setNestedProperty(bean, parameterName, ConvertUtils.convert(parameterValue, 
-                                                 PropertyUtils.getPropertyDescriptor(bean, parameterName).getPropertyType()));
-            }
-            catch (Exception e )
-            {
-                // Exception are ignored, this catch block is triggered 
-                // when a http request param doesn't match to a bean property            
-            }
-         }
-         
-         return bean;
-         
-         
-         
-     }
-}
+/*
+ * Copyright 2000-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.
+ */
+package org.apache.portals.graffito.portlets.bean;
+
+
+import java.util.Enumeration;
+
+import javax.portlet.PortletRequest;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.PropertyUtils;
+
+/**
+ * Utility class used to manage java beans
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class BeanUtil
+{
+     /**
+      * Update bean properties with the value found in the portlet request paramters
+      * 
+      * @param portletRequest
+      * @param bean The bean to update
+      * @return The updated bean
+      */
+     public static Object populate(PortletRequest portletRequest, Object bean)
+     {
+         Enumeration parameterNames = portletRequest.getParameterNames();
+         while(parameterNames.hasMoreElements())
+         {
+             String parameterName = (String) parameterNames.nextElement();
+             String parameterValue = portletRequest.getParameter(parameterName);
+             
+            try
+            {
+                PropertyUtils.setNestedProperty(bean, parameterName, ConvertUtils.convert(parameterValue, 
+                                                 PropertyUtils.getPropertyDescriptor(bean, parameterName).getPropertyType()));
+            }
+            catch (Exception e )
+            {
+                // Exception are ignored, this catch block is triggered 
+                // when a http request param doesn't match to a bean property            
+            }
+         }
+         
+         return bean;
+         
+         
+         
+     }
+}

Propchange: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/bean/BeanUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/EditPortletPage.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/EditPortletPage.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/EditPortletPage.java (original)
+++ incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/EditPortletPage.java Wed Sep 20 12:37:05 2006
@@ -1,41 +1,41 @@
-/*
- * Copyright 2000-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.
- */
-package org.apache.portals.graffito.portlets.page;
-
-import java.util.ArrayList;
-
-/**
- * Edit portlet page is a page used in the edit mode.
- * When the end-user move to the view mode, this viewPortletPage will be used.
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class EditPortletPage extends PortletPage
-{
- 
-    private ArrayList viewPortletPages = new ArrayList();
-    
-    public ArrayList getViewPortletPages()
-    {
-        return viewPortletPages;
-    }
-    
-    public void addViewPortletPageReference(PortletPageRef portletPageRef)
-    {
-        viewPortletPages.add(portletPageRef);
-    }
-}
+/*
+ * Copyright 2000-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.
+ */
+package org.apache.portals.graffito.portlets.page;
+
+import java.util.ArrayList;
+
+/**
+ * Edit portlet page is a page used in the edit mode.
+ * When the end-user move to the view mode, this viewPortletPage will be used.
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class EditPortletPage extends PortletPage
+{
+ 
+    private ArrayList viewPortletPages = new ArrayList();
+    
+    public ArrayList getViewPortletPages()
+    {
+        return viewPortletPages;
+    }
+    
+    public void addViewPortletPageReference(PortletPageRef portletPageRef)
+    {
+        viewPortletPages.add(portletPageRef);
+    }
+}

Propchange: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/EditPortletPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPage.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPage.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPage.java (original)
+++ incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPage.java Wed Sep 20 12:37:05 2006
@@ -1,95 +1,95 @@
-/*
- * Copyright 2000-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.
- */
-package org.apache.portals.graffito.portlets.page;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.portals.graffito.portlets.page.tab.Tab;
-
-/**
- * Portlet Page
- * 
- * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public abstract class PortletPage
-{
-    /** Page ID */
-    private String id;
-    
-    /** Template assigned to this portlet page */
-    private String template;
-    
-    /** Action used to retrieve/refresh the portlet page */
-    private String action;
-    
-    /** True if it is the default page */
-    private boolean isDefaultPage;
-    
-    /** Velocity tabs (empty map is no tabs are defined in this page */
-    private Map tabs = new HashMap();
-
-    
-    public String getId()
-    {
-        return id;
-    }
-    public void setId(String id)
-    {
-        this.id = id;
-    }
-    public String getTemplate()
-    {
-        return template;
-    }
-    
-    public void setTemplate(String template)
-    {
-        this.template = template;
-    }
-        
-    public String getAction()
-    {
-        return action;
-    }
-    
-    public void setAction(String action)
-    {
-        this.action = action;
-    }
-
-    
-    public boolean isDefaultPage()
-    {
-        return isDefaultPage;
-    }
-    
-    public void setDefaultPage(boolean isDefaultPage)
-    {
-        this.isDefaultPage = isDefaultPage;
-    }
-    
-    public Map getTabs()
-    {
-        return tabs;
-    }
-    
-    public void addTab(Tab tab)
-    {
-        tabs.put(tab.getId(), tab);
-    }
-}
+/*
+ * Copyright 2000-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.
+ */
+package org.apache.portals.graffito.portlets.page;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.portals.graffito.portlets.page.tab.Tab;
+
+/**
+ * Portlet Page
+ * 
+ * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public abstract class PortletPage
+{
+    /** Page ID */
+    private String id;
+    
+    /** Template assigned to this portlet page */
+    private String template;
+    
+    /** Action used to retrieve/refresh the portlet page */
+    private String action;
+    
+    /** True if it is the default page */
+    private boolean isDefaultPage;
+    
+    /** Velocity tabs (empty map is no tabs are defined in this page */
+    private Map tabs = new HashMap();
+
+    
+    public String getId()
+    {
+        return id;
+    }
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+    public String getTemplate()
+    {
+        return template;
+    }
+    
+    public void setTemplate(String template)
+    {
+        this.template = template;
+    }
+        
+    public String getAction()
+    {
+        return action;
+    }
+    
+    public void setAction(String action)
+    {
+        this.action = action;
+    }
+
+    
+    public boolean isDefaultPage()
+    {
+        return isDefaultPage;
+    }
+    
+    public void setDefaultPage(boolean isDefaultPage)
+    {
+        this.isDefaultPage = isDefaultPage;
+    }
+    
+    public Map getTabs()
+    {
+        return tabs;
+    }
+    
+    public void addTab(Tab tab)
+    {
+        tabs.put(tab.getId(), tab);
+    }
+}

Propchange: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPageRef.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPageRef.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPageRef.java (original)
+++ incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPageRef.java Wed Sep 20 12:37:05 2006
@@ -1,49 +1,49 @@
-/*
- * Copyright 2000-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.
- */
-package org.apache.portals.graffito.portlets.page;
-
-/**
- * Reference to a portlet page
- * 
- * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class PortletPageRef
-{
-    private String condition;
-    private String portletPageId;
-    
-    
-    public String getCondition()
-    {
-        return condition;
-    }
-    
-    public void setCondition(String condition)
-    {
-        this.condition = condition;
-    }
-    
-    public String getPortletPageId()
-    {
-        return portletPageId;
-    }
-    
-    public void setPortletPageId(String portletPageId)
-    {
-        this.portletPageId = portletPageId;
-    }
-}
+/*
+ * Copyright 2000-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.
+ */
+package org.apache.portals.graffito.portlets.page;
+
+/**
+ * Reference to a portlet page
+ * 
+ * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class PortletPageRef
+{
+    private String condition;
+    private String portletPageId;
+    
+    
+    public String getCondition()
+    {
+        return condition;
+    }
+    
+    public void setCondition(String condition)
+    {
+        this.condition = condition;
+    }
+    
+    public String getPortletPageId()
+    {
+        return portletPageId;
+    }
+    
+    public void setPortletPageId(String portletPageId)
+    {
+        this.portletPageId = portletPageId;
+    }
+}

Propchange: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPageRef.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPages.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPages.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPages.java (original)
+++ incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPages.java Wed Sep 20 12:37:05 2006
@@ -1,114 +1,114 @@
-/*
- * Copyright 2000-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.
- */
-package org.apache.portals.graffito.portlets.page;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
-/**
- * All page associated to a portlet   
- * 
- * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class PortletPages
-{
-    private Map viewPages = new HashMap();   
-    private String defaultViewPageId = null;
-    
-    private Map editPages = new HashMap();
-    private String defaultEditPageId = null;
-    
-    private HashMap actions = new HashMap();
-    private String forwardActionId;
-       
-    protected Log log = LogFactory.getLog(PortletPages.class);
-       
-    public Map getEditPages()
-    {
-        return editPages;
-    }
-
-    
-    public void addEditPage(EditPortletPage editPortletPage)
-    {
-        editPages.put(editPortletPage.getId(), editPortletPage);   
-        if (editPortletPage.isDefaultPage())
-        {
-            defaultEditPageId = editPortletPage.getId();
-        }
-    }
-    
-    public Map getViewPages()
-    {
-        return viewPages;
-    }
-    
-    public void addViewPage(ViewPortletPage viewPortletPage)
-    {
-        viewPages.put(viewPortletPage.getId(), viewPortletPage);
-        if (viewPortletPage.isDefaultPage())
-        {
-            defaultViewPageId = viewPortletPage.getId();
-        }
-        
-    }
-    
-    
-    public Map getActions()
-    {
-        return actions;
-    }
-    
-    public void addAction (String id, String className, boolean isForwardAction)
-    {
-        actions.put(id, className);
-        if (isForwardAction)
-        {
-            this.forwardActionId = id;
-        }
-    }
-    
-    public String getDefaultEditPageId()
-    {
-        return defaultEditPageId;
-    }
-    
-    public void setDefaultEditPageId(String defaultEditPageId)
-    {
-        this.defaultEditPageId = defaultEditPageId;
-    }
-    
-    public String getDefaultViewPageId()
-    {
-        return defaultViewPageId;
-    }
-    
-    public void setDefaultViewPageId(String defaultViewPageId)
-    {
-        this.defaultViewPageId = defaultViewPageId;
-    }
-    
-    public String getForwardActionId()
-    {
-        return forwardActionId;
-    }
-}
+/*
+ * Copyright 2000-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.
+ */
+package org.apache.portals.graffito.portlets.page;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * All page associated to a portlet   
+ * 
+ * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class PortletPages
+{
+    private Map viewPages = new HashMap();   
+    private String defaultViewPageId = null;
+    
+    private Map editPages = new HashMap();
+    private String defaultEditPageId = null;
+    
+    private HashMap actions = new HashMap();
+    private String forwardActionId;
+       
+    protected Log log = LogFactory.getLog(PortletPages.class);
+       
+    public Map getEditPages()
+    {
+        return editPages;
+    }
+
+    
+    public void addEditPage(EditPortletPage editPortletPage)
+    {
+        editPages.put(editPortletPage.getId(), editPortletPage);   
+        if (editPortletPage.isDefaultPage())
+        {
+            defaultEditPageId = editPortletPage.getId();
+        }
+    }
+    
+    public Map getViewPages()
+    {
+        return viewPages;
+    }
+    
+    public void addViewPage(ViewPortletPage viewPortletPage)
+    {
+        viewPages.put(viewPortletPage.getId(), viewPortletPage);
+        if (viewPortletPage.isDefaultPage())
+        {
+            defaultViewPageId = viewPortletPage.getId();
+        }
+        
+    }
+    
+    
+    public Map getActions()
+    {
+        return actions;
+    }
+    
+    public void addAction (String id, String className, boolean isForwardAction)
+    {
+        actions.put(id, className);
+        if (isForwardAction)
+        {
+            this.forwardActionId = id;
+        }
+    }
+    
+    public String getDefaultEditPageId()
+    {
+        return defaultEditPageId;
+    }
+    
+    public void setDefaultEditPageId(String defaultEditPageId)
+    {
+        this.defaultEditPageId = defaultEditPageId;
+    }
+    
+    public String getDefaultViewPageId()
+    {
+        return defaultViewPageId;
+    }
+    
+    public void setDefaultViewPageId(String defaultViewPageId)
+    {
+        this.defaultViewPageId = defaultViewPageId;
+    }
+    
+    public String getForwardActionId()
+    {
+        return forwardActionId;
+    }
+}

Propchange: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/PortletPages.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/ViewPortletPage.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/ViewPortletPage.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/ViewPortletPage.java (original)
+++ incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/ViewPortletPage.java Wed Sep 20 12:37:05 2006
@@ -1,42 +1,42 @@
-/*
- * Copyright 2000-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.
- */
-package org.apache.portals.graffito.portlets.page;
-
-import java.util.ArrayList;
-
-/**
- * View portlet page is a page used in the view mode.
- * When the end-user move to the edit mode, the editPortletPage will be used.
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class ViewPortletPage extends PortletPage
-{
-    private ArrayList editPortletPages = new ArrayList();
-    
-   
-    public ArrayList getEditPortletPages()
-    {
-        return editPortletPages;
-    }
-    
-    public void addEditPortletPageReference(PortletPageRef portletPageRef)
-    {
-        editPortletPages.add(portletPageRef);
-    }
-
-}
+/*
+ * Copyright 2000-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.
+ */
+package org.apache.portals.graffito.portlets.page;
+
+import java.util.ArrayList;
+
+/**
+ * View portlet page is a page used in the view mode.
+ * When the end-user move to the edit mode, the editPortletPage will be used.
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class ViewPortletPage extends PortletPage
+{
+    private ArrayList editPortletPages = new ArrayList();
+    
+   
+    public ArrayList getEditPortletPages()
+    {
+        return editPortletPages;
+    }
+    
+    public void addEditPortletPageReference(PortletPageRef portletPageRef)
+    {
+        editPortletPages.add(portletPageRef);
+    }
+
+}

Propchange: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/ViewPortletPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/action/PortletActionInfo.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/action/PortletActionInfo.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/action/PortletActionInfo.java (original)
+++ incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/action/PortletActionInfo.java Wed Sep 20 12:37:05 2006
@@ -1,134 +1,134 @@
-/*
- * Copyright 2000-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.
- */
-package org.apache.portals.graffito.portlets.page.action;
-
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-import org.apache.portals.graffito.portlets.page.manager.PortletPageManager;
-import org.apache.portals.graffito.portlets.upload.PortletDiskFileUpload;
-
-/**
- * This class contain information on the action to execute. 
- *
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class PortletActionInfo
-{
-    private String ACTION_SEPARATOR = "\\.";
-
-    private String id;
-
-    private String actionMethod;
-
-    private PortletDiskFileUpload diskFileUpload;
-    
-    private PortletRequest request;
-    
-    private PortletResponse response;
-    
-    private PortletPageManager portletPageManager;
-        
-    /**
-     * Constructor 
-     *    
-     * @param actionExpression This expression contain the action name & action method method to execute (eg. : "document.save") 
-     * @param request The action request
-     * @param response The action response
-     */
-    public PortletActionInfo(PortletPageManager portletPageManager, String actionExpression, PortletRequest request, PortletResponse response)
-    {
-        this.portletPageManager = portletPageManager;
-        String[] split = actionExpression.split(ACTION_SEPARATOR);
-        id = split[0];
-        actionMethod = split[1];
-        
-        this.request = request;
-        this.response = response;
-        
-
-    }
-
-    /**
-     * Constructor 
-     * 
-     * @param actionExpression This expression contain the action name & action method method to execute (eg. : "document.save") 
-     * @param request The action request
-     * @param response The action response
-     * @param diskFileUpload The Portlet disk upload
-     */
-    public PortletActionInfo(PortletPageManager portletPageManager, String actionExpression,  PortletRequest request, PortletResponse response, PortletDiskFileUpload diskFileUpload)
-    {
-        this(portletPageManager, actionExpression, request, response);
-        this.diskFileUpload = diskFileUpload;
-    }
-
-    /**
-     * Get the action name
-     * @return the action name
-     */
-    public String getId()
-    {
-        return id;
-    }
-
-    /**
-     * Get the action method
-     * @return the action method
-     */
-    public String getActionMethod()
-    {
-        return actionMethod;
-    }
-
-    /**
-     * Get the Portlet Disk file uplodad
-     * @return the portlet disk file upload
-     */
-    public PortletDiskFileUpload getDiskFileUpload()
-    {
-        return diskFileUpload;
-    }
-    
-    /**
-     * Get the portlet  request 
-     * @return the portlet request
-     */
-    public PortletRequest getRequest()
-    {
-        return request;
-    }
-    
-    /**
-     * Get the portlet action response
-     * @return the portlet action response
-     */
-    public PortletResponse getResponse()
-    {
-        return response;
-    }
-    
-    
-    public PortletPageManager getPortletPageManager()
-    {
-        return portletPageManager;
-    }
-    public void setPortletPageManager(PortletPageManager portletPageManager)
-    {
-        this.portletPageManager = portletPageManager;
-    }
+/*
+ * Copyright 2000-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.
+ */
+package org.apache.portals.graffito.portlets.page.action;
+
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+
+import org.apache.portals.graffito.portlets.page.manager.PortletPageManager;
+import org.apache.portals.graffito.portlets.upload.PortletDiskFileUpload;
+
+/**
+ * This class contain information on the action to execute. 
+ *
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class PortletActionInfo
+{
+    private String ACTION_SEPARATOR = "\\.";
+
+    private String id;
+
+    private String actionMethod;
+
+    private PortletDiskFileUpload diskFileUpload;
+    
+    private PortletRequest request;
+    
+    private PortletResponse response;
+    
+    private PortletPageManager portletPageManager;
+        
+    /**
+     * Constructor 
+     *    
+     * @param actionExpression This expression contain the action name & action method method to execute (eg. : "document.save") 
+     * @param request The action request
+     * @param response The action response
+     */
+    public PortletActionInfo(PortletPageManager portletPageManager, String actionExpression, PortletRequest request, PortletResponse response)
+    {
+        this.portletPageManager = portletPageManager;
+        String[] split = actionExpression.split(ACTION_SEPARATOR);
+        id = split[0];
+        actionMethod = split[1];
+        
+        this.request = request;
+        this.response = response;
+        
+
+    }
+
+    /**
+     * Constructor 
+     * 
+     * @param actionExpression This expression contain the action name & action method method to execute (eg. : "document.save") 
+     * @param request The action request
+     * @param response The action response
+     * @param diskFileUpload The Portlet disk upload
+     */
+    public PortletActionInfo(PortletPageManager portletPageManager, String actionExpression,  PortletRequest request, PortletResponse response, PortletDiskFileUpload diskFileUpload)
+    {
+        this(portletPageManager, actionExpression, request, response);
+        this.diskFileUpload = diskFileUpload;
+    }
+
+    /**
+     * Get the action name
+     * @return the action name
+     */
+    public String getId()
+    {
+        return id;
+    }
+
+    /**
+     * Get the action method
+     * @return the action method
+     */
+    public String getActionMethod()
+    {
+        return actionMethod;
+    }
+
+    /**
+     * Get the Portlet Disk file uplodad
+     * @return the portlet disk file upload
+     */
+    public PortletDiskFileUpload getDiskFileUpload()
+    {
+        return diskFileUpload;
+    }
+    
+    /**
+     * Get the portlet  request 
+     * @return the portlet request
+     */
+    public PortletRequest getRequest()
+    {
+        return request;
+    }
+    
+    /**
+     * Get the portlet action response
+     * @return the portlet action response
+     */
+    public PortletResponse getResponse()
+    {
+        return response;
+    }
+    
+    
+    public PortletPageManager getPortletPageManager()
+    {
+        return portletPageManager;
+    }
+    public void setPortletPageManager(PortletPageManager portletPageManager)
+    {
+        this.portletPageManager = portletPageManager;
+    }
 }

Propchange: incubator/graffito/trunk/applications/framework-portlets/src/java/org/apache/portals/graffito/portlets/page/action/PortletActionInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message