Author: thomas.heute(a)jboss.com Date: 2010-12-11 06:29:26 -0500 (Sat, 11 Dec 2010) New Revision: 5570 Modified: epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/pom.xml epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/src/main/webapp/WEB-INF/portlet.xml epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/src/main/webapp/WEB-INF/portlet.xml epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/pom.xml epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/src/main/webapp/WEB-INF/portlet.xml epp/examples/branches/EPP_5_1_Branch/portlets/simplesthelloworld/pom.xml epp/examples/branches/EPP_5_1_Branch/portlets/simplesthelloworld/src/main/webapp/WEB-INF/portlet.xml epp/examples/branches/EPP_5_1_Branch/skins/simpleskin/pom.xml epp/examples/branches/EPP_5_1_Branch/skins/simpleskin/src/main/webapp/WEB-INF/web.xml Log: Nice names, pom version changes, simpleskin fix Modified: epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/pom.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/pom.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.portal.examples.portlets</groupId> - <version>1.0.1-GA-SNAPSHOT</version> + <version>1.1.0-GA-SNAPSHOT</version> <artifactId>gatein-idm-helloworld</artifactId> <packaging>war</packaging> @@ -12,8 +12,8 @@ <properties> <gatein.home>${EPP_HOME}/jboss-as/server/default/deploy/gatein.ear</gatein.home> - <gatein.core.version>2.3.6-CR02</gatein.core.version> - <gatein.kernel.version>2.2.6-CR02</gatein.kernel.version> + <gatein.core.version>2.3.6-GA</gatein.core.version> + <gatein.kernel.version>2.2.6-GA</gatein.kernel.version> </properties> <build> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/src/main/webapp/WEB-INF/portlet.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/src/main/webapp/WEB-INF/portlet.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -5,15 +5,20 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> <portlet> - <portlet-name>IDMHelloWorldPortlet</portlet-name> - <portlet-class> - org.jboss.portal.portlet.samples.IDMHelloWorldPortlet - </portlet-class> - <supports> - <mime-type>text/html</mime-type> - </supports> - <portlet-info> - <title>IDM Hello World Portlet</title> - </portlet-info> + <description xml:lang="EN">IDM Hello World Portlet</description> + <portlet-name>IDMHelloWorldPortlet</portlet-name> + <display-name xml:lang="EN">IDM Hello World Portlet</display-name> + <portlet-class>org.jboss.portal.portlet.samples.IDMHelloWorldPortlet</portlet-class> + + <supports> + <mime-type>text/html</mime-type> + </supports> + + <portlet-info> + <title>IDM Hello World Portlet</title> + <short-title>IDM Hello World Portlet</short-title> + <keywords>Sample</keywords> + </portlet-info> + </portlet> </portlet-app> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -12,7 +12,7 @@ <properties> <portletBridge.home>${EPP_HOME}/portletbridge</portletBridge.home> - <portletBridge.version>2.1.0.CR2.EPP51</portletBridge.version> + <portletBridge.version>2.1.0.GA.EPP51</portletBridge.version> </properties> <build> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/src/main/webapp/WEB-INF/portlet.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/src/main/webapp/WEB-INF/portlet.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -5,32 +5,38 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> <portlet> - <portlet-name>JSFHelloUserPortlet</portlet-name> - <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>view</portlet-mode> - <portlet-mode>edit</portlet-mode> - <portlet-mode>help</portlet-mode> - </supports> - <portlet-info> - <title>JSF Hello User Portlet</title> - </portlet-info> + <description xml:lang="EN">JSF Hello User Portlet</description> + <portlet-name>JSFHelloUserPortlet</portlet-name> + <display-name xml:lang="EN">JSF Hello User Portlet</display-name> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> + + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>view</portlet-mode> + <portlet-mode>edit</portlet-mode> + <portlet-mode>help</portlet-mode> + </supports> + + <portlet-info> + <title>JSF Hello User Portlet</title> + <short-title>JSF Hello User Portlet</short-title> + <keywords>Sample</keywords> + </portlet-info> - <init-param> - <name>javax.portlet.faces.defaultViewId.view</name> - <value>/jsf/welcome.jsp</value> - </init-param> + <init-param> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/jsf/welcome.jsp</value> + </init-param> - <init-param> - <name>javax.portlet.faces.defaultViewId.edit</name> - <value>/jsf/edit.jsp</value> - </init-param> + <init-param> + <name>javax.portlet.faces.defaultViewId.edit</name> + <value>/jsf/edit.jsp</value> + </init-param> - <init-param> - <name>javax.portlet.faces.defaultViewId.help</name> - <value>/jsf/help.jsp</value> - </init-param> + <init-param> + <name>javax.portlet.faces.defaultViewId.help</name> + <value>/jsf/help.jsp</value> + </init-param> </portlet> -</portlet-app> \ No newline at end of file +</portlet-app> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/pom.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/pom.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.portal.examples.portlets</groupId> - <version>1.0.1-GA-SNAPSHOT</version> + <version>1.0.2-GA-SNAPSHOT</version> <artifactId>gatein-jsp-hellouser</artifactId> <packaging>war</packaging> <name>EPP Portlets Examples - JSP Hello User Portlet</name> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/src/main/webapp/WEB-INF/portlet.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/src/main/webapp/WEB-INF/portlet.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -5,16 +5,24 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> <portlet> - <portlet-name>JSPHelloUserPortlet</portlet-name> - <portlet-class>org.jboss.portal.portlet.samples.JSPHelloUserPortlet</portlet-class> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>view</portlet-mode> - <portlet-mode>edit</portlet-mode> - <portlet-mode>help</portlet-mode> - </supports> - <portlet-info> - <title>JSP Hello User Portlet</title> - </portlet-info> + + <description xml:lang="EN">JSP Hello User Portlet</description> + <portlet-name>JSPHelloUserPortlet</portlet-name> + <display-name xml:lang="EN">JSP Hello User Portlet</display-name> + <portlet-class>org.jboss.portal.portlet.samples.JSPHelloUserPortlet</portlet-class> + + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>view</portlet-mode> + <portlet-mode>edit</portlet-mode> + <portlet-mode>help</portlet-mode> + </supports> + + <portlet-info> + <title>JSP Hello User Portlet</title> + <short-title>JSP Hello User Portlet</short-title> + <keywords>Sample</keywords> + </portlet-info> + </portlet> -</portlet-app> \ No newline at end of file +</portlet-app> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/simplesthelloworld/pom.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/portlets/simplesthelloworld/pom.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.portal.examples.portlets</groupId> - <version>1.0.0-GA-SNAPSHOT</version> + <version>1.0.1-GA-SNAPSHOT</version> <artifactId>gatein-simplest-helloworld</artifactId> <packaging>war</packaging> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/simplesthelloworld/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/simplesthelloworld/src/main/webapp/WEB-INF/portlet.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/portlets/simplesthelloworld/src/main/webapp/WEB-INF/portlet.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -5,15 +5,24 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> <portlet> - <portlet-name>SimplestHelloWorldPortlet</portlet-name> - <portlet-class> - org.jboss.portal.portlet.samples.SimplestHelloWorldPortlet - </portlet-class> - <supports> - <mime-type>text/html</mime-type> - </supports> - <portlet-info> - <title>Simplest Hello World Portlet</title> - </portlet-info> + + <description xml:lang="EN">Simplest Hello World Portlet</description> + <portlet-name>SimplestHelloWorldPortlet</portlet-name> + <display-name xml:lang="EN">Simplest Hello World Portlet</display-name> + <portlet-class>org.jboss.portal.portlet.samples.SimplestHelloWorldPortlet</portlet-class> + + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>view</portlet-mode> + <portlet-mode>edit</portlet-mode> + <portlet-mode>help</portlet-mode> + </supports> + + <portlet-info> + <title>Simplest Hello World Portlet</title> + <short-title>Simplest Hello World Portlet</short-title> + <keywords>Sample</keywords> + </portlet-info> + </portlet> -</portlet-app> \ No newline at end of file +</portlet-app> Modified: epp/examples/branches/EPP_5_1_Branch/skins/simpleskin/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/skins/simpleskin/pom.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/skins/simpleskin/pom.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -23,7 +23,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.portal.examples.skins</groupId> - <version>1.0.0-GA-SNAPSHOT</version> + <version>1.0.1-GA-SNAPSHOT</version> <artifactId>gatein-simple-skin</artifactId> <packaging>war</packaging> <name>EPP Skins Examples - Simple Deployable Skin</name> Modified: epp/examples/branches/EPP_5_1_Branch/skins/simpleskin/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2010-12-11 01:16:01 UTC (rev 5569) +++ epp/examples/branches/EPP_5_1_Branch/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2010-12-11 11:29:26 UTC (rev 5570) @@ -24,7 +24,7 @@ <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.5"> - <display-name>gatein-sample-skin</display-name> + <display-name>gatein-simple-skin</display-name> <filter> <filter-name>ResourceRequestFilter</filter-name> <filter-class>org.exoplatform.portal.application.ResourceRequestFilter</filter-class>