[jboss-svn-commits] JBL Code SVN: r9857 - in labs/jbosslabs/trunk/portal-extensions/forge-contributor: src/java/org/jboss/forge/contributor and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 28 18:11:26 EST 2007
Author: dejp
Date: 2007-02-28 18:11:26 -0500 (Wed, 28 Feb 2007)
New Revision: 9857
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-contributor/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.properties
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/web.xml
Log:
cleaning
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/maven.xml 2007-02-28 21:44:24 UTC (rev 9856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/maven.xml 2007-02-28 23:11:26 UTC (rev 9857)
@@ -1,9 +1,10 @@
<!--
- JBoss, the OpenSource J2EE webOS
- Distributable under LGPL license.
- See terms of license at gnu.org.
- -->
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant"
+ xmlns:u="jelly:util">
<!-- Default war-project goals -->
<goal name="all">
@@ -13,11 +14,11 @@
<goal name="build">
<attainGoal name="prj-war-build" />
</goal>
-
- <goal name="deploy">
+
+ <goal name="deploy">
<attainGoal name="prj-war-deploy" />
</goal>
-
+
<goal name="clean">
<attainGoal name="prj-clean" />
</goal>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.properties 2007-02-28 21:44:24 UTC (rev 9856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/project.properties 2007-02-28 23:11:26 UTC (rev 9857)
@@ -1,5 +1,6 @@
maven.repo.remote=http://repo1.maven.org/maven
maven.junit.fork=yes
maven.war.src=${basedir}/src/web
+maven.jar.includes=**/*.class, **/*.properties
maven.final.name=${pom.artifactId}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java 2007-02-28 21:44:24 UTC (rev 9856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java 2007-02-28 23:11:26 UTC (rev 9857)
@@ -385,8 +385,8 @@
this.committer = committer;
}
- public Map<String, String> getProjectsNameId() {
- return server.getProjectsNameId();
+ public Map<String, String> getProjectsNameIds() {
+ return server.getProjectsNameIds();
}
public String getComment() {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2007-02-28 21:44:24 UTC (rev 9856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2007-02-28 23:11:26 UTC (rev 9857)
@@ -557,7 +557,7 @@
return null;
}
- Map<String, String> getProjectsNameId() {
+ public Map<String, String> getProjectsNameIds() {
return ProjectsHelper.getProjectsNameId(FacesTools.getPortalName());
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml 2007-02-28 21:44:24 UTC (rev 9856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml 2007-02-28 23:11:26 UTC (rev 9857)
@@ -6,108 +6,156 @@
<faces-config>
<navigation-rule>
- <from-view-id>/repo-access/default/contributor/contributor.jsp</from-view-id>
+ <from-view-id>
+ /repo-access/default/contributor/contributor.jsp
+ </from-view-id>
<navigation-case>
<from-outcome>apply</from-outcome>
- <to-view-id>/repo-access/default/contributor/apply.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/apply.jsp
+ </to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>admin</from-outcome>
- <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/admin.jsp
+ </to-view-id>
</navigation-case>
</navigation-rule>
-
+
<navigation-rule>
- <from-view-id>/repo-access/default/contributor/admin.jsp</from-view-id>
+ <from-view-id>
+ /repo-access/default/contributor/admin.jsp
+ </from-view-id>
<navigation-case>
<from-outcome>back</from-outcome>
- <to-view-id>/repo-access/default/contributor/contributor.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/contributor.jsp
+ </to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>adminDelete</from-outcome>
- <to-view-id>/repo-access/default/contributor/adminDelete.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/adminDelete.jsp
+ </to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>leadDelete</from-outcome>
- <to-view-id>/repo-access/default/contributor/leadDelete.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/leadDelete.jsp
+ </to-view-id>
</navigation-case>
</navigation-rule>
-
+
<navigation-rule>
- <from-view-id>/repo-access/default/contributor/adminDelete.jsp</from-view-id>
+ <from-view-id>
+ /repo-access/default/contributor/adminDelete.jsp
+ </from-view-id>
<navigation-case>
<from-outcome>back</from-outcome>
- <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/admin.jsp
+ </to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>admin</from-outcome>
- <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/admin.jsp
+ </to-view-id>
</navigation-case>
- </navigation-rule>
+ </navigation-rule>
<navigation-rule>
- <from-view-id>/repo-access/default/contributor/leadDelete.jsp</from-view-id>
+ <from-view-id>
+ /repo-access/default/contributor/leadDelete.jsp
+ </from-view-id>
<navigation-case>
<from-outcome>back</from-outcome>
- <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/admin.jsp
+ </to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>admin</from-outcome>
- <to-view-id>/repo-access/default/contributor/admin.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/admin.jsp
+ </to-view-id>
</navigation-case>
</navigation-rule>
-
+
<navigation-rule>
- <from-view-id>/repo-access/default/contributor/apply.jsp</from-view-id>
+ <from-view-id>
+ /repo-access/default/contributor/apply.jsp
+ </from-view-id>
<navigation-case>
<from-outcome>back</from-outcome>
- <to-view-id>/repo-access/default/contributor/contributor.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/contributor.jsp
+ </to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>individual</from-outcome>
- <to-view-id>/repo-access/default/contributor/individual.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/individual.jsp
+ </to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>corporate</from-outcome>
- <to-view-id>/repo-access/default/contributor/corporate.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/corporate.jsp
+ </to-view-id>
</navigation-case>
</navigation-rule>
-
+
<navigation-rule>
- <from-view-id>/repo-access/default/contributor/individual.jsp</from-view-id>
+ <from-view-id>
+ /repo-access/default/contributor/individual.jsp
+ </from-view-id>
<navigation-case>
<from-outcome>back</from-outcome>
- <to-view-id>/repo-access/default/contributor/apply.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/apply.jsp
+ </to-view-id>
</navigation-case>
</navigation-rule>
-
+
<navigation-rule>
- <from-view-id>/repo-access/default/contributor/corporate.jsp</from-view-id>
+ <from-view-id>
+ /repo-access/default/contributor/corporate.jsp
+ </from-view-id>
<navigation-case>
<from-outcome>back</from-outcome>
- <to-view-id>/repo-access/default/contributor/apply.jsp</to-view-id>
+ <to-view-id>
+ /repo-access/default/contributor/apply.jsp
+ </to-view-id>
</navigation-case>
</navigation-rule>
-
+
<managed-bean>
<managed-bean-name>conServer</managed-bean-name>
- <managed-bean-class>org.jboss.forge.contributor.ConServer</managed-bean-class>
+ <managed-bean-class>
+ org.jboss.forge.contributor.ConServer
+ </managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>con</managed-bean-name>
- <managed-bean-class>org.jboss.forge.contributor.ConMainBean</managed-bean-class>
+ <managed-bean-class>
+ org.jboss.forge.contributor.ConMainBean
+ </managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>server</property-name>
<value>#{conServer}</value>
</managed-property>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>conAccessBean</managed-bean-name>
- <managed-bean-class>org.jboss.forge.contributor.ConAccessBean</managed-bean-class>
+ <managed-bean-class>
+ org.jboss.forge.contributor.ConAccessBean
+ </managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
</faces-config>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet-instances.xml 2007-02-28 21:44:24 UTC (rev 9856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet-instances.xml 2007-02-28 23:11:26 UTC (rev 9857)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployments>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>ConPortletInstance</instance-id>
- <portlet-ref>ConPortlet</portlet-ref>
- </instance>
- </deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>ConPortletInstance</instance-id>
+ <portlet-ref>ConPortlet</portlet-ref>
+ </instance>
+ </deployment>
</deployments>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet.xml 2007-02-28 21:44:24 UTC (rev 9856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/portlet.xml 2007-02-28 23:11:26 UTC (rev 9857)
@@ -1,22 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
- <portlet>
- <portlet-name>ConPortlet</portlet-name>
- <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class>
- <init-param>
- <name>default-view</name>
- <value>/repo-access/default/contributor/contributor.jsp</value>
- </init-param>
- <expiration-cache>0</expiration-cache>
- <supported-locale>en</supported-locale>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>Contributor application</title>
- </portlet-info>
- </portlet>
+<portlet-app
+ xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd"
+ version="1.0">
+ <portlet>
+ <portlet-name>ConPortlet</portlet-name>
+ <portlet-class>
+ org.apache.myfaces.portlet.MyFacesGenericPortlet
+ </portlet-class>
+ <init-param>
+ <name>default-view</name>
+ <value>
+ /repo-access/default/contributor/contributor.jsp
+ </value>
+ </init-param>
+ <expiration-cache>0</expiration-cache>
+ <supported-locale>en</supported-locale>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Contributor application</title>
+ </portlet-info>
+ </portlet>
</portlet-app>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/web.xml 2007-02-28 21:44:24 UTC (rev 9856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/web.xml 2007-02-28 23:11:26 UTC (rev 9857)
@@ -4,14 +4,18 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ <listener-class>
+ org.apache.myfaces.webapp.StartupServletContextListener
+ </listener-class>
</listener>
<filter>
<filter-name>filesFromRepoFilter</filter-name>
- <filter-class>org.jboss.forge.common.FilesFromRepoFilter</filter-class>
+ <filter-class>
+ org.jboss.forge.common.FilesFromRepoFilter
+ </filter-class>
</filter>
-
+
<filter-mapping>
<filter-name>filesFromRepoFilter</filter-name>
<url-pattern>/repo-access/*</url-pattern>
More information about the jboss-svn-commits
mailing list