portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal maven.xml
Date Tue, 08 Mar 2005 04:28:52 GMT
dlestrat    2005/03/07 20:28:52

  Modified:    portal/src/webapp/WEB-INF/pages jsf-demo.psml
               portal/src/webapp/WEB-INF/conf Log4j.properties
               etc/project-dependencies myfaces-deps.xml
               portal   maven.xml
  Added:       portal/src/webapp/WEB-INF/pages/wip folder.metadata
                        role-mgt.psml
               etc/project-dependencies jsf-api-deps.xml
                        jsf-bridge-deps.xml
  Removed:     etc/project-dependencies myfaces-bridge-deps.xml
               portal/src/webapp/WEB-INF/pages/Administrative role-mgt.psml
  Log:
  Update myfaces dependencies to 1.0.9.
  Move JSF bridge.
  Add documentation.
  
  Revision  Changes    Path
  1.7       +7 -4      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/jsf-demo.psml
  
  Index: jsf-demo.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/jsf-demo.psml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jsf-demo.psml	25 Jan 2005 00:48:40 -0000	1.6
  +++ jsf-demo.psml	8 Mar 2005 04:28:52 -0000	1.7
  @@ -1,4 +1,4 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  +<?xml version="1.0" encoding="UTF-8"?>
   <!--
   Copyright 2004 The Apache Software Foundation
   
  @@ -16,13 +16,12 @@
   -->
   <page id="JSFPortlets">
       <defaults
  -     skin="orange"
        layout-decorator="tigris"
        portlet-decorator="tigris"
     />
     
      <title>JSF Demo</title>
  -  <fragment id="jsfportletspage" type="layout" name="jetspeed::VelocityTwoColumns">
  +   <fragment id="jsfportletspage" type="layout" name="jetspeed::VelocityTwoColumns">
        <fragment id="jsfGuessNumber1" type="portlet" name="jsf-demo::guessNumber">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
  @@ -30,7 +29,11 @@
        <fragment id="jsfCalendar" type="portlet" name="jsf-demo::CalendarPortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
  -     </fragment>                                                            	   
                                                             
  +     </fragment>
  +     <fragment id="jsfGuessNumber2" type="portlet" name="jsf-demo-myfaces::guessNumberMyFaces">
  +      <property layout="TwoColumns" name="row" value="1" />
  +      <property layout="TwoColumns" name="column" value="0" />
  +     </fragment>                                                        	       
                                      
     </fragment>
     <metadata name="title" xml:lang="ja">
           JSF 数当てポートレット
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/wip/folder.metadata
  
  Index: folder.metadata
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <folder>
    <title >Work In Progress</title>  
    <metadata name="title" xml:lang="fr">En Construction</metadata>
    <metadata name="title" xml:lang="ja">Work In Progrees</metadata>
  
    <document-order>role-mgt.psml</document-order>
  
    <security-constraints>
      <security-constraints-ref>manager</security-constraints-ref>
      <security-constraint>
        <groups>engineering</groups>
        <permissions>view, edit</permissions>
      </security-constraint>
    </security-constraints>
  </folder>
  
  
  
  1.1                  jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/wip/role-mgt.psml
  
  Index: role-mgt.psml
  ===================================================================
  <!--
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.
-->
<page id="rolemgt-wip">
  <defaults
     layout-decorator="tigris"
    portlet-decorator="tigris"
  />
  <title>Role Management</title>
  <fragment
id="rolemgt-1" type="layout" name="jetspeed::VelocityTwoColumns">
    <fragment id="rolemgt-2"
type="portlet" name="security::RoleMgtPortlet">
      <property layout="TwoColumns"
name="row" value="0" />
      <property layout="TwoColumns" name="column" value="0"
/>
    </fragment>
  </fragment>
</page>
  
  
  1.12      +3 -6      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/Log4j.properties
  
  Index: Log4j.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/Log4j.properties,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Log4j.properties	14 Jan 2005 19:06:43 -0000	1.11
  +++ Log4j.properties	8 Mar 2005 04:28:52 -0000	1.12
  @@ -92,11 +92,8 @@
   #
   # myfaces(-portlet) Category
   #
  -log4j.category.org.apache.portals.bridges.myfaces = TRACE, MYFACES
  -log4j.additivity.org.apache.portals.bridges.myfaces = false
  -
  -log4j.category.net.sourceforge.myfaces = TRACE, MYFACES
  -log4j.additivity.net.sourceforge.myfaces = false
  +log4j.category.org.apache.myfaces = TRACE, MYFACES
  +log4j.additivity.org.apache.myfaces = false
   
   #
   # Content Server
  
  
  
  1.3       +1 -1      jakarta-jetspeed-2/etc/project-dependencies/myfaces-deps.xml
  
  Index: myfaces-deps.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/etc/project-dependencies/myfaces-deps.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- myfaces-deps.xml	29 Nov 2004 21:14:25 -0000	1.2
  +++ myfaces-deps.xml	8 Mar 2005 04:28:52 -0000	1.3
  @@ -1,7 +1,7 @@
   <dependency>
       <groupId>myfaces</groupId>
       <artifactId>myfaces</artifactId>
  -    <version>1.0.8-PATCHED</version>
  +    <version>1.0.9</version>
       <properties>
   		<war.bundle>true</war.bundle>
   	</properties>
  
  
  
  1.1                  jakarta-jetspeed-2/etc/project-dependencies/jsf-api-deps.xml
  
  Index: jsf-api-deps.xml
  ===================================================================
  <dependency>
      <groupId>myfaces</groupId>
      <artifactId>myfaces-jsf-api</artifactId>
      <version>1.0.9</version>
      <properties>
  		<war.bundle>true</war.bundle>
  	</properties>
  </dependency>
  
  
  1.1                  jakarta-jetspeed-2/etc/project-dependencies/jsf-bridge-deps.xml
  
  Index: jsf-bridge-deps.xml
  ===================================================================
  <dependency>
      <groupId>portals-bridges</groupId>
      <artifactId>portals-bridges-jsf</artifactId>
      <version>0.1</version>
      <properties>
  		<war.bundle>true</war.bundle>
      </properties>
  </dependency>
  
  
  1.120     +17 -2     jakarta-jetspeed-2/portal/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- maven.xml	2 Feb 2005 03:21:40 -0000	1.119
  +++ maven.xml	8 Mar 2005 04:28:52 -0000	1.120
  @@ -301,12 +301,17 @@
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
   
  -  <goal name="pam.jsfdeploy">
  - 	
  +  <goal name="pam.jsfdeploy">	
    	<j:set var="maven.build.dir" value="../applications/jsf-demo/target" /> 	
    	<j:set var="maven.war.final.name" value="jsf-demo.war" />
    	<attainGoal name="jetspeed2:deploy" />
     </goal>
  +  
  +  <goal name="pam.jsfmyfacesdeploy">	
  + 	<j:set var="maven.build.dir" value="../applications/jsf-demo-myfaces/target" />
	
  + 	<j:set var="maven.war.final.name" value="jsf-demo-myfaces.war" />
  + 	<attainGoal name="jetspeed2:deploy" />
  +  </goal>
   
     <goal name="pam.securitydeploy">
     	<!--
  @@ -385,6 +390,12 @@
    	<j:set var="pam.app.type" value="webapp"/>
    	<attainGoal name="pam.template.undeploy"/>
     </goal>
  +  
  +  <goal name="pam.jsfmyfacesundeploy">
  + 	<j:set var="pam.app.name" value="jsf-demo-myfaces"/>
  + 	<j:set var="pam.app.type" value="webapp"/>
  + 	<attainGoal name="pam.template.undeploy"/>
  +  </goal>
   
     <goal name="pam.securityundeploy">
    	<j:set var="pam.app.name" value="security"/>
  @@ -468,6 +479,7 @@
     	 <attainGoal name="pam.pamdeploy" />  	 
        <attainGoal name="pam.strutsdeploy" />
        <attainGoal name="pam.jsfdeploy" />
  +     <attainGoal name="pam.jsfmyfacesdeploy" />
        <attainGoal name="pam.securitydeploy" />
        <attainGoal name="pam.phpdeploy" />
        <attainGoal name="pam.perldeploy" />
  @@ -484,6 +496,7 @@
     	 <attainGoal name="pam.pamdeploy" />  	 
        <attainGoal name="pam.strutsdeploy" />
        <attainGoal name="pam.jsfdeploy" />
  +     <attainGoal name="pam.jsfmyfacesdeploy" />
        <attainGoal name="pam.securitydeploy" />
        <attainGoal name="pam.phpdeploy" />
        <attainGoal name="pam.perldeploy" />
  @@ -673,6 +686,8 @@
       <delete file="${org.apache.jetspeed.deploy.war.dir}/struts-demo.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/jsf-demo"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/jsf-demo.war"/>
  +    <delete dir="${org.apache.jetspeed.deploy.war.dir}/jsf-demo-myfaces"/>
  +    <delete file="${org.apache.jetspeed.deploy.war.dir}/jsf-demo-myfaces.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/PHP"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/PHP.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/perl"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message