portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roger...@apache.org
Subject cvs commit: jakarta-jetspeed-2/applications/demo project.xml
Date Sun, 05 Dec 2004 00:54:55 GMT
rogerrut    2004/12/04 16:54:55

  Modified:    components/capability project.xml
               components/portlet-factory project.xml
               components/id-generator project.xml
               components/locator project.xml
               components/page-manager project.xml
               applications/struts-demo project.xml
               components/registry project.xml
               maven-plugin plugin.jelly
               components/web-content project.xml .classpath
               applications/pam .classpath project.xml
               components/deploy-tool README.txt project.xml
               components/persistence project.xml
               applications/jsf-demo project.xml
               components/jetspeed project.xml
               taglibs  project.xml
               layout-portlets project.xml
               components/sso project.xml
               applications/security project.xml
               components/search project.xml
               portal   maven.xml project.xml
               components/security project.xml
               archives OLD-GETTING-STARTED.txt
               applications/php project.xml
               .        project.xml
               commons  project.xml
               components/rdbms project.xml
               components/cm project.xml
               components/prefs project.xml
               components/profiler project.xml
               components/file-cache project.xml
               applications/perl project.xml
               taglibs/treecontrol project.xml
               jetspeed-api project.xml
               applications/demo project.xml
  Log:
  Change jar-version-tag to 2.0-M1
  
  Revision  Changes    Path
  1.13      +6 -6      jakarta-jetspeed-2/components/capability/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/capability/project.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- project.xml	1 Dec 2004 17:06:29 -0000	1.12
  +++ project.xml	5 Dec 2004 00:54:53 -0000	1.13
  @@ -23,7 +23,7 @@
     <id>jetspeed-capability</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Capability Components</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Capability Components defines an api for "guessing" what client is accessing a
  @@ -48,27 +48,27 @@
     	<dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>  	  	
      	<dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-registry</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>    
       <!-- Testing only -->
       <dependency>
         <id>jetspeed2:jetspeed-rdbms</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>    	
     	 <dependency>
         <id>commons-lang</id>
  
  
  
  1.4       +3 -3      jakarta-jetspeed-2/components/portlet-factory/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/portlet-factory/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	13 Oct 2004 20:01:46 -0000	1.3
  +++ project.xml	5 Dec 2004 00:54:53 -0000	1.4
  @@ -24,7 +24,7 @@
     <id>jetspeed-portlet-factory</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Portlet Factory</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Jetspeed Portlet Factory
  @@ -62,11 +62,11 @@
       </dependency>           
       <dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>commons-logging</id>
  
  
  
  1.8       +3 -3      jakarta-jetspeed-2/components/id-generator/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/id-generator/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	1 Dec 2004 17:06:29 -0000	1.7
  +++ project.xml	5 Dec 2004 00:54:53 -0000	1.8
  @@ -23,7 +23,7 @@
     <id>jetspeed-id-generator</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 ID Generator</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Jetspeed ID Generator
  @@ -39,11 +39,11 @@
     	&spring-deps;
     	<dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>commons-logging</id>
  
  
  
  1.8       +3 -3      jakarta-jetspeed-2/components/locator/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/locator/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	1 Dec 2004 17:06:29 -0000	1.7
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.8
  @@ -23,7 +23,7 @@
     <id>jetspeed-locator</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Template Locator</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Jetspeed Locator provides a transparent mechanism to locate resources
  @@ -40,11 +40,11 @@
     	&spring-deps;
       <dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>commons-logging</id>
  
  
  
  1.14      +11 -11    jakarta-jetspeed-2/components/page-manager/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml	1 Dec 2004 17:06:29 -0000	1.13
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.14
  @@ -23,7 +23,7 @@
     <id>jetspeed-page-manager</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Page Manager</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Page management implementations.
  @@ -45,44 +45,44 @@
     	
      	<dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-persistence</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-registry</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>      
       <dependency>
         <id>jetspeed2:jetspeed-file-cache</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-id-generator</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>       
       <dependency>
         <id>jetspeed2:jetspeed-security</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-locator</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-profiler</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <!-- Testing only -->
       <dependency>
         <id>jetspeed2:jetspeed-rdbms</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>    	
     	 <dependency>
         <id>commons-lang</id>
  
  
  
  1.3       +2 -2      jakarta-jetspeed-2/applications/struts-demo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/struts-demo/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	18 Aug 2004 01:09:55 -0000	1.2
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.3
  @@ -21,7 +21,7 @@
     <pomVersion>3</pomVersion>
     <id>struts-demo</id>
     <name>Struts Portlet Demo</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.struts.webapp.example</package>
     <description>Struts Portlet Demo</description>
     <shortDescription>Struts Portlet Demo</shortDescription>
  
  
  
  1.33      +8 -8      jakarta-jetspeed-2/components/registry/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/project.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- project.xml	1 Dec 2004 17:06:29 -0000	1.32
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.33
  @@ -23,7 +23,7 @@
     <id>jetspeed-registry</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Registry Components</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Registry Components
  @@ -48,14 +48,14 @@
     	<dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
        <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -63,7 +63,7 @@
       <dependency>
         <id>jetspeed-persistence</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -71,14 +71,14 @@
       <dependency>
         <id>jetspeed-prefs</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-portlet-factory</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -87,7 +87,7 @@
       <dependency>
         <id>jetspeed-rdbms</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  @@ -205,7 +205,7 @@
       <dependency>
         <id>jetspeed-commons</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  
  
  
  1.25      +2 -2      jakarta-jetspeed-2/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.jelly,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- plugin.jelly	1 Dec 2004 20:27:49 -0000	1.24
  +++ plugin.jelly	5 Dec 2004 00:54:54 -0000	1.25
  @@ -170,7 +170,7 @@
          <!-- END OF TO BE REMOVED -->
       </j:forEach>
      <echo>Copying Jetspeed 2 portal files...</echo>
  -  	<copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-2.0-a1-dev.jar" todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
  +  	<copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-2.0-M1.jar" todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
     	<copy todir="${maven.war.webapp.dir}" failonerror="true" overwrite="false">
            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp" />            	       	       
        </copy>	  
  @@ -209,7 +209,7 @@
     	
   	
       <echo>Copying Jetspeed 2 portal files...</echo>
  -  	<copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-2.0-a1-dev.jar" todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
  +  	<copy file="${maven.repo.local}/jetspeed2/jars/jetspeed-2.0-M1.jar" todir="${webapp.build.lib}" failonerror="true" overwrite="true"/>
     	<copy todir="${basedir}/target/debug" failonerror="true" overwrite="false">
            <fileset dir="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp" />            	       	       
        </copy>	  
  
  
  
  1.10      +4 -4      jakarta-jetspeed-2/components/web-content/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/web-content/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	3 Dec 2004 04:29:56 -0000	1.9
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.10
  @@ -23,7 +23,7 @@
     <id>jetspeed-web-content</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Web Content</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Web content service and portlet implementations.
  @@ -42,15 +42,15 @@
     	
     	<dependency>
         <id>jetspeed2:jetspeed-components</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
      	<dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
      	<dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>	
       <dependency>
         <id>commons-httpclient</id>
  
  
  
  1.2       +1 -1      jakarta-jetspeed-2/components/web-content/.classpath
  
  Index: .classpath
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/web-content/.classpath,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .classpath	12 Nov 2004 06:30:40 -0000	1.1
  +++ .classpath	5 Dec 2004 00:54:54 -0000	1.2
  @@ -25,7 +25,7 @@
     </classpathentry>
     <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar">
     </classpathentry>
  -  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-a1-dev.jar">
  +  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-M1.jar">
     </classpathentry>
     <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0.jar">
     </classpathentry>
  
  
  
  1.2       +5 -5      jakarta-jetspeed-2/applications/pam/.classpath
  
  Index: .classpath
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/.classpath,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .classpath	12 Nov 2004 06:34:25 -0000	1.1
  +++ .classpath	5 Dec 2004 00:54:54 -0000	1.2
  @@ -5,9 +5,9 @@
     </classpathentry>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
     </classpathentry>
  -  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-api-2.0-a1-dev.jar">
  +  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-api-2.0-M1.jar">
     </classpathentry>
  -  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-registry-2.0-a1-dev.jar">
  +  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-registry-2.0-M1.jar">
     </classpathentry>
     <classpathentry kind="var" path="MAVEN_REPO/pluto/jars/pluto-1.0.1-rc1.jar">
     </classpathentry>
  @@ -21,9 +21,9 @@
     </classpathentry>
     <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar">
     </classpathentry>
  -  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-a1-dev.jar">
  +  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-M1.jar">
     </classpathentry>
  -  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed2-taglib-treecontrol-2.0-a1-dev.jar">
  +  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed2-taglib-treecontrol-2.0-M1.jar">
     </classpathentry>
     <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar">
     </classpathentry>
  @@ -55,7 +55,7 @@
     </classpathentry>
     <classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-core-1.1.1.jar">
     </classpathentry>
  -  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-web-content-2.0-a1-dev.jar">
  +  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-web-content-2.0-M1.jar">
     </classpathentry>
     <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.1.jar">
     </classpathentry>
  
  
  
  1.26      +3 -3      jakarta-jetspeed-2/applications/pam/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/project.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- project.xml	2 Dec 2004 05:22:12 -0000	1.25
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.26
  @@ -42,7 +42,7 @@
           <dependency>
               <groupId>jetspeed2</groupId>
               <artifactId>jetspeed-api</artifactId>
  -            <version>2.0-a1-dev</version>
  +            <version>2.0-M1</version>
               <type>jar</type>
               <properties>
                   <war.bundle>false</war.bundle>
  @@ -105,7 +105,7 @@
           <dependency>
               <groupId>jetspeed2</groupId>
               <artifactId>jetspeed-commons</artifactId>
  -            <version>2.0-a1-dev</version>
  +            <version>2.0-M1</version>
               <type>jar</type>
               <properties>
                   <war.bundle>false</war.bundle>
  @@ -114,7 +114,7 @@
           <dependency>
               <groupId>jetspeed2</groupId>
               <artifactId>jetspeed2-taglib-treecontrol</artifactId>
  -            <version>2.0-a1-dev</version>
  +            <version>2.0-M1</version>
               <type>jar</type>
               <properties>
                   <war.bundle>true</war.bundle>
  
  
  
  1.3       +2 -2      jakarta-jetspeed-2/components/deploy-tool/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/deploy-tool/README.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- README.txt	2 Aug 2004 22:30:55 -0000	1.2
  +++ README.txt	5 Dec 2004 00:54:54 -0000	1.3
  @@ -1,7 +1,7 @@
   To Run the command line tool:
   
  -java -jar target/jetspeed-deploy-tools-2.0-a1-dev-uber.jar source.war destination.war
  +java -jar target/jetspeed-deploy-tools-2.0-M1-uber.jar source.war destination.war
   
   To make a portlet application register at Servlet init time:
   
  -java -jar target/jetspeed-deploy-tools-2.0-a1-dev-uber.jar -r source.war destination.war
  +java -jar target/jetspeed-deploy-tools-2.0-M1-uber.jar -r source.war destination.war
  
  
  
  1.5       +1 -1      jakarta-jetspeed-2/components/deploy-tool/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/deploy-tool/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	15 Nov 2004 22:48:15 -0000	1.4
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.5
  @@ -19,7 +19,7 @@
     <id>jetspeed-deploy-tools</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Deploy Tools</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed.tools</package>
     <description>
   	  Jetspeed Deploy Tools
  
  
  
  1.28      +4 -4      jakarta-jetspeed-2/components/persistence/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/project.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- project.xml	1 Dec 2004 17:06:30 -0000	1.27
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.28
  @@ -23,7 +23,7 @@
     <id>jetspeed-persistence</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Persistence Components</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Persistence Components
  @@ -43,11 +43,11 @@
       <dependency>
         <id>jetspeed-commons</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
        <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -57,7 +57,7 @@
       <dependency>
         <id>jetspeed-rdbms</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
     	 <dependency>
         <id>commons-lang</id>
  
  
  
  1.10      +2 -2      jakarta-jetspeed-2/applications/jsf-demo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/jsf-demo/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	29 Nov 2004 21:10:04 -0000	1.9
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.10
  @@ -24,7 +24,7 @@
     <pomVersion>3</pomVersion>
     <id>jsf-demo</id>
     <name>JSF Portlet Demo</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.portals.webapp.example</package>
     <description>JSF Portlet Demo</description>
     <shortDescription>JSF Portlet Demo</shortDescription>
  
  
  
  1.16      +2 -2      jakarta-jetspeed-2/components/jetspeed/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/project.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.xml	2 Dec 2004 22:56:41 -0000	1.15
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.16
  @@ -23,7 +23,7 @@
     <id>jetspeed-components</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Components</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Jetspeed Components
  @@ -52,7 +52,7 @@
       <dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  
  
  
  1.2       +1 -1      jakarta-jetspeed-2/taglibs/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/taglibs/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	2 Jul 2004 04:00:18 -0000	1.1
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.2
  @@ -20,7 +20,7 @@
     <id>jetspeed2-taglibs</id>
     <name>Jetspeed 2 TagLibs</name>
     <groupId>jetspeed2</groupId>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
   
     <organization>
       <name>Apache Software Foundation</name>
  
  
  
  1.8       +5 -5      jakarta-jetspeed-2/layout-portlets/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/layout-portlets/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	22 Oct 2004 22:42:32 -0000	1.7
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.8
  @@ -68,35 +68,35 @@
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-cm</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-registry</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  
  
  
  1.4       +7 -7      jakarta-jetspeed-2/components/sso/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/sso/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	2 Dec 2004 03:20:29 -0000	1.3
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.4
  @@ -23,7 +23,7 @@
     <id>jetspeed-sso</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Single Sign On Components</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Single Sign On SSO Components
  @@ -63,7 +63,7 @@
       <dependency>
         <id>jetspeed-security</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  @@ -73,7 +73,7 @@
   	<dependency>
         <id>jetspeed-api</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -81,7 +81,7 @@
     	<dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -89,7 +89,7 @@
       <dependency>
         <id>jetspeed-persistence</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -101,7 +101,7 @@
       <dependency>
         <id>jetspeed-rdbms</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  @@ -203,7 +203,7 @@
       <dependency>
         <id>jetspeed-commons</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  
  
  
  1.14      +3 -3      jakarta-jetspeed-2/applications/security/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/security/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml	30 Nov 2004 19:19:24 -0000	1.13
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.14
  @@ -21,7 +21,7 @@
   <project>
     <extend>${basedir}/./../project.xml</extend>
     <id>security</id>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <name>Jetspeed-2 Security Portlet Application</name>
     <description>Security Portlets Container</description>
     <shortDescription>Security Portlets Container</shortDescription>
  @@ -35,7 +35,7 @@
     	<dependency>
         <groupId>jetspeed2</groupId>
         <artifactId>jetspeed-api</artifactId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <type>jar</type>
         <properties>
           <war.bundle>false</war.bundle>
  @@ -80,7 +80,7 @@
       <dependency>
         <id>jetspeed-commons</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  
  
  
  1.6       +3 -3      jakarta-jetspeed-2/components/search/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/search/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	1 Dec 2004 17:06:29 -0000	1.5
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.6
  @@ -23,7 +23,7 @@
     <id>jetspeed-search</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Search Component</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Search component for Jetspeed.
  @@ -41,14 +41,14 @@
     	<dependency>
         <id>jetspeed-api</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
      	<dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>commons-httpclient</id>
  
  
  
  1.111     +2 -2      jakarta-jetspeed-2/portal/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- maven.xml	19 Nov 2004 21:53:57 -0000	1.110
  +++ maven.xml	5 Dec 2004 00:54:54 -0000	1.111
  @@ -484,8 +484,8 @@
   
     <goal name="catalina:shared"
           description="Copy all jars necessary for common container">
  -    <copy file="../commons/target/jetspeed-commons-2.0-a1-dev.jar" todir="${org.apache.jetspeed.server.shared}"/>
  -    <copy file="../jetspeed-api/target/jetspeed-api-2.0-a1-dev.jar" todir="${org.apache.jetspeed.server.shared}"/>
  +    <copy file="../commons/target/jetspeed-commons-2.0-M1.jar" todir="${org.apache.jetspeed.server.shared}"/>
  +    <copy file="../jetspeed-api/target/jetspeed-api-2.0-M1.jar" todir="${org.apache.jetspeed.server.shared}"/>
       <copy file="../portlet-api/target/portlet-api-1.0.jar" todir="${org.apache.jetspeed.server.shared}"/>
     </goal>
   
  
  
  
  1.114     +20 -20    jakarta-jetspeed-2/portal/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- project.xml	2 Dec 2004 05:18:35 -0000	1.113
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.114
  @@ -45,7 +45,7 @@
       <dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -53,7 +53,7 @@
        <dependency>
         <id>content-server</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -61,7 +61,7 @@
       <dependency>
         <id>jetspeed-components</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -69,7 +69,7 @@
       <dependency>
         <id>jetspeed-deploy-tools</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -77,7 +77,7 @@
       <dependency>
         <id>jetspeed-rdbms</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -85,7 +85,7 @@
       <dependency>
         <id>jetspeed-persistence</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -93,7 +93,7 @@
       <dependency>
         <id>jetspeed-prefs</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -101,7 +101,7 @@
       <dependency>
         <id>jetspeed-search</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -109,7 +109,7 @@
       <dependency>
         <id>jetspeed-security</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -117,63 +117,63 @@
       <dependency>
         <id>jetspeed-registry</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
        <dependency>
         <id>jetspeed2:jetspeed-id-generator</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>    
       <dependency>
         <id>jetspeed2:jetspeed-file-cache</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
        <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
       </dependency>
        <dependency>
         <id>jetspeed2:jetspeed-locator</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-capability</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>    
       <dependency>
         <id>jetspeed2:jetspeed-profiler</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-page-manager</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-portlet-factory</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -303,7 +303,7 @@
       <dependency>
         <id>jetspeed-commons</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  @@ -459,7 +459,7 @@
        <dependency>
         <id>jetspeed-sso</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  
  
  
  1.25      +7 -7      jakarta-jetspeed-2/components/security/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/security/project.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- project.xml	1 Dec 2004 17:06:29 -0000	1.24
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.25
  @@ -23,7 +23,7 @@
     <id>jetspeed-security</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Security Components</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Security Components
  @@ -47,7 +47,7 @@
   	<dependency>
         <id>jetspeed-api</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -55,7 +55,7 @@
     	<dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -63,7 +63,7 @@
       <dependency>
         <id>jetspeed-persistence</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -71,7 +71,7 @@
       <dependency>
         <id>jetspeed-prefs</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -81,7 +81,7 @@
       <dependency>
         <id>jetspeed-rdbms</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  @@ -183,7 +183,7 @@
       <dependency>
         <id>jetspeed-commons</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  
  
  
  1.2       +1 -1      jakarta-jetspeed-2/archives/OLD-GETTING-STARTED.txt
  
  Index: OLD-GETTING-STARTED.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/archives/OLD-GETTING-STARTED.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OLD-GETTING-STARTED.txt	18 May 2004 19:52:28 -0000	1.1
  +++ OLD-GETTING-STARTED.txt	5 Dec 2004 00:54:54 -0000	1.2
  @@ -120,7 +120,7 @@
   NOTE: im experience a problem where the portlet-container jar isn't the latest one copied into the HW_APP webapp
         this causes HelloPortlet to not display any info
         Its easily fixed by manually copying 
  -  ${maven.repo.home}/jetspeed2/jars/jetspeed-container-2.0-a1-dev.jar ${catalina.home}/webapps/HW_APP/WEB-INF/lib/
  +  ${maven.repo.home}/jetspeed2/jars/jetspeed-container-2.0-M1.jar ${catalina.home}/webapps/HW_APP/WEB-INF/lib/
   
     I also think that this jar should not be put in the WAR during WAR creation, but should either be:
       a) in catalina shared
  
  
  
  1.5       +2 -2      jakarta-jetspeed-2/applications/php/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/php/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	11 Nov 2004 01:15:36 -0000	1.4
  +++ project.xml	5 Dec 2004 00:54:54 -0000	1.5
  @@ -5,7 +5,7 @@
   <project>
     <extend>${basedir}/./../project.xml</extend>
     <id>php</id>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <name>Jetspeed-2 PHP Portlet Application</name>
     <description>PHP Portlet</description>
     <shortDescription>PHP Portlets</shortDescription>
  
  
  
  1.22      +1 -1      jakarta-jetspeed-2/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/project.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- project.xml	13 Oct 2004 20:01:43 -0000	1.21
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.22
  @@ -2,7 +2,7 @@
       <pomVersion>3</pomVersion>
       <name>Jetspeed 2 Enterprise Portal</name>
       <groupId>jetspeed2</groupId>
  -    <currentVersion>2.0-a1-dev</currentVersion>
  +    <currentVersion>2.0-M1</currentVersion>
       <organization>
           <name>Apache Software Foundation</name>
           <url>http://portals.apache.org/</url>
  
  
  
  1.23      +2 -2      jakarta-jetspeed-2/commons/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/commons/project.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- project.xml	13 Oct 2004 20:01:45 -0000	1.22
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.23
  @@ -19,7 +19,7 @@
     <pomVersion>3</pomVersion>
     <id>jetspeed-commons</id>
     <name>Jetspeed-2 Portal Commons</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Common code used by engine(portal) and container.
  @@ -41,7 +41,7 @@
       </dependency>
        <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  
  
  
  1.12      +2 -2      jakarta-jetspeed-2/components/rdbms/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml	1 Dec 2004 17:06:31 -0000	1.11
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.12
  @@ -23,7 +23,7 @@
     <id>jetspeed-rdbms</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 RDBMS Components</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  RDBMS Components
  @@ -40,7 +40,7 @@
     	<dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  
  
  
  1.17      +2 -2      jakarta-jetspeed-2/components/cm/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/project.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- project.xml	1 Dec 2004 17:06:30 -0000	1.16
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.17
  @@ -23,7 +23,7 @@
     <id>jetspeed-cm</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Component Manager</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Component Manager
  @@ -40,7 +40,7 @@
     	&db-ojb-deps; 
     	<dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  
  
  
  1.22      +5 -5      jakarta-jetspeed-2/components/prefs/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/project.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- project.xml	1 Dec 2004 17:06:29 -0000	1.21
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.22
  @@ -45,14 +45,14 @@
       <dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
        <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -60,7 +60,7 @@
       <dependency>
         <id>jetspeed-persistence</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  @@ -69,7 +69,7 @@
       <dependency>
         <id>jetspeed-rdbms</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  @@ -171,7 +171,7 @@
       <dependency>
         <id>jetspeed-commons</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  
  
  
  1.8       +9 -9      jakarta-jetspeed-2/components/profiler/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/profiler/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	1 Dec 2004 17:06:32 -0000	1.7
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.8
  @@ -23,7 +23,7 @@
     <id>jetspeed-profiler</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 Profiler</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Profiler implementations.
  @@ -46,39 +46,39 @@
     	<dependency>
         <id>jetspeed-cm</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>  	
      	<dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-persistence</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-registry</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>      
       <dependency>
         <id>jetspeed2:jetspeed-security</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-locator</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <!-- Testing only -->
       <dependency>
         <id>jetspeed2:jetspeed-rdbms</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>    	
     	 <dependency>
         <id>commons-lang</id>
  
  
  
  1.10      +3 -3      jakarta-jetspeed-2/components/file-cache/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	1 Dec 2004 17:06:32 -0000	1.9
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.10
  @@ -24,7 +24,7 @@
     <id>jetspeed-file-cache</id>
     <groupId>jetspeed2</groupId>
     <name>Jetspeed-2 File Cache</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <package>org.apache.jetspeed</package>
     <description>
   	  Jetspeed File Cache
  @@ -40,11 +40,11 @@
     	 &spring-deps;
       <dependency>
         <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>jetspeed2:jetspeed-api</id>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
       </dependency>
       <dependency>
         <id>commons-logging</id>
  
  
  
  1.4       +3 -3      jakarta-jetspeed-2/applications/perl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/perl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	3 Nov 2004 21:08:15 -0000	1.3
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.4
  @@ -6,7 +6,7 @@
     <extend>${basedir}/./../project.xml</extend>
     <artifactId>perl</artifactId>
     <groupId>perl</groupId>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
     <name>Jetspeed-2 perl Portlet Application</name>
     <description>perl Portlet</description>
     <shortDescription>perl Portlets</shortDescription>
  @@ -64,7 +64,7 @@
       <dependency>
         <id>jetspeed-commons</id>
         <groupId>jetspeed2</groupId>
  -      <version>2.0-a1-dev</version>
  +      <version>2.0-M1</version>
         <properties>
           <war.bundle>false</war.bundle>
         </properties>
  
  
  
  1.3       +1 -1      jakarta-jetspeed-2/taglibs/treecontrol/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/taglibs/treecontrol/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	11 Jul 2004 03:32:22 -0000	1.2
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.3
  @@ -19,7 +19,7 @@
     <id>jetspeed2-taglib-treecontrol</id>
     <name>Jetspeed 2 TreeControl TagLib</name>
     <groupId>jetspeed2</groupId>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  +  <currentVersion>2.0-M1</currentVersion>
   
     <organization>
       <name>Apache Software Foundation</name>
  
  
  
  1.10      +1 -1      jakarta-jetspeed-2/jetspeed-api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/jetspeed-api/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	13 Oct 2004 20:01:45 -0000	1.9
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.10
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;	
]>

<!--
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.
-->
   <project>
  -<extend>${basedir}/../project.xml</extend>
  <pomVersion>3</pomVersion>
  <id>jetspeed-api</id>
  <groupId>jetspeed2</groupId>
  <name>Jetspeed-2 Core API</name>
  <currentVersion>2.0-a1-dev</currentVersion>
  <package>org.apache.jetspeed</package>
  <description>
	  Core API for implmeneting Jetspeed
  </description>
  <shortDescription>Helps locate resources on the file system.</shortDescription>

  <repository>                 
    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
    <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
  </repository>

  <dependencies>
    <dependency>
      <id>junit</id>
      <version>3.8.1</version>
    </dependency>
    <dependency>
      <id>pluto</id>
      <version>1.0.1-rc1</version>
    </dependency>   
     <dependency>      
      <id>portlet-api</id>
      <version>1.0</version>
    </dependency>
    <dependency>
      <id>servletapi</id>
      <version>2.3</version>
    </dependency>  
  </dependencies>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
     <resources>
      <resource>
        <directory>${basedir}/src/java</directory>
        <excludes>
          <exclude>**/*.java</exclude>
        </excludes>
      </resource>
    </resources>
    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
    <unitTest>
       <includes>
        <include>**/Test*.java</include>
      </includes>
      <excludes>
      </excludes>
      <resources>
        <resource>
          <directory>${basedir}/src/test</directory>
          <excludes>
          <exclude>**/*.java</exclude>
          </excludes>
        </resource>
      </resources>
    </unitTest>
    
  </build>
  +<extend>${basedir}/../project.xml</extend>
  <pomVersion>3</pomVersion>
  <id>jetspeed-api</id>
  <groupId>jetspeed2</groupId>
  <name>Jetspeed-2 Core API</name>
  <currentVersion>2.0-M1</currentVersion>
  <package>org.apache.jetspeed</package>
  <description>
	  Core API for implmeneting Jetspeed
  </description>
  <shortDescription>Helps locate resources on the file system.</shortDescription>

  <repository>                 
    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
    <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
  </repository>

  <dependencies>
    <dependency>
      <id>junit</id>
      <version>3.8.1</version>
    </dependency>
    <dependency>
      <id>pluto</id>
      <version>1.0.1-rc1</version>
    </dependency>   
     <dependency>      
      <id>portlet-api</id>
      <version>1.0</version>
    </dependency>
    <dependency>
      <id>servletapi</id>
      <version>2.3</version>
    </dependency>  
  </dependencies>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
     <resources>
      <resource>
        <directory>${basedir}/src/java</directory>
        <excludes>
          <exclude>**/*.java</exclude>
        </excludes>
      </resource>
    </resources>
    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
    <unitTest>
       <includes>
        <include>**/Test*.java</include>
      </includes>
      <excludes>
      </excludes>
      <resources>
        <resource>
          <directory>${basedir}/src/test</directory>
          <excludes>
          <exclude>**/*.java</exclude>
          </excludes>
        </resource>
      </resources>
    </unitTest>
    
  </build>
     <reports>
  
  	&j2-reports;
  
     </reports>  
   </project>
  
  
  
  1.25      +3 -3      jakarta-jetspeed-2/applications/demo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/project.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- project.xml	2 Dec 2004 22:58:04 -0000	1.24
  +++ project.xml	5 Dec 2004 00:54:55 -0000	1.25
  @@ -88,7 +88,7 @@
           <dependency>
               <groupId>jetspeed2</groupId>
               <artifactId>jetspeed-commons</artifactId>
  -            <version>2.0-a1-dev</version>
  +            <version>2.0-M1</version>
               <type>jar</type>
               <properties>
                   <war.bundle>false</war.bundle>
  @@ -149,7 +149,7 @@
   		<dependency>
               <groupId>jetspeed2</groupId>
               <artifactId>jetspeed-web-content</artifactId>
  -            <version>2.0-a1-dev</version>
  +            <version>2.0-M1</version>
               <type>jar</type>
               <properties>
                   <war.bundle>true</war.bundle>
  @@ -158,7 +158,7 @@
           <dependency>
   	        <groupId>jetspeed2</groupId>
   	        <artifactId>jetspeed-components</artifactId>
  -      		<version>2.0-a1-dev</version>
  +      		<version>2.0-M1</version>
   			 <type>jar</type>
   			 <properties>
   			 	<war.bundle>true</war.bundle>
  
  
  

---------------------------------------------------------------------
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