[jboss-cvs] jboss-seam/build ...

Peter Muir peter at bleepbleep.org.uk
Tue Sep 25 12:13:17 EDT 2007


  User: pmuir   
  Date: 07/09/25 12:13:17

  Modified:    build          mail.pom.xml common.build.xml ioc.pom.xml
                        debug.pom.xml remoting.pom.xml pdf.pom.xml
                        ui.pom.xml core.pom.xml root.pom.xml
  Log:
  Lots of fixes for examples builds inc. port groovybooking build onto shared, fix wiki build, stop using provided scope, and some runtime dependencies
  
  Revision  Changes    Path
  1.6       +0 -3      jboss-seam/build/mail.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: mail.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/mail.pom.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- mail.pom.xml	22 Sep 2007 13:41:43 -0000	1.5
  +++ mail.pom.xml	25 Sep 2007 16:13:17 -0000	1.6
  @@ -49,19 +49,16 @@
       <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>jsf-api</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>javax.el</groupId>
         <artifactId>el-api</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
     </dependencies>
  
  
  
  1.7       +7 -7      jboss-seam/build/common.build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: common.build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/common.build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- common.build.xml	24 Sep 2007 13:12:52 -0000	1.6
  +++ common.build.xml	25 Sep 2007 16:13:17 -0000	1.7
  @@ -96,13 +96,13 @@
   	</target>
   
   	<target name="copyseamdependencies" if="mavenized.property" unless="copyseamdependenciesdone" depends="initcopy, initpoms">
  -		<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" />
  -		<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" />
  -		<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" />
  -		<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
  -		<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
  -		<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" />
  -		<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" />
  +		<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" />
  +		<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" />
  +		<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
  +		<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
  +		<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
  +		<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="runtime" />
  +		<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="runtime" />
   		<property name="copyseamdependenciesdone" value="true" />
   	</target>
   
  
  
  
  1.7       +0 -10     jboss-seam/build/ioc.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ioc.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/ioc.pom.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ioc.pom.xml	22 Sep 2007 13:41:43 -0000	1.6
  +++ ioc.pom.xml	25 Sep 2007 16:13:17 -0000	1.7
  @@ -37,38 +37,32 @@
       <dependency>
         <groupId>javax.el</groupId>
         <artifactId>el-api</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>javax.transaction</groupId>
         <artifactId>jta</artifactId>
         <optional>true</optional>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>javassist</groupId>
         <artifactId>javassist</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-jmx</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-system</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-kernel</artifactId>
  -      <scope>provided</scope>
         <exclusions>
           <exclusion>
             <groupId>apache-httpclient</groupId>
  @@ -100,21 +94,18 @@
       <dependency>
         <groupId>jboss.jboss-aop</groupId>
         <artifactId>jboss-aop</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>javax.persistence</groupId>
         <artifactId>persistence-api</artifactId>
         <optional>true</optional>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate</artifactId>
         <optional>true</optional>
  -      <scope>provided</scope>
         <exclusions>
           <exclusion>
             <groupId>commons-collections</groupId>
  @@ -138,7 +129,6 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
  
  
  
  1.5       +0 -3      jboss-seam/build/debug.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: debug.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/debug.pom.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- debug.pom.xml	20 Sep 2007 18:36:02 -0000	1.4
  +++ debug.pom.xml	25 Sep 2007 16:13:17 -0000	1.5
  @@ -21,7 +21,6 @@
   		<dependency>
   			<groupId>javax.faces</groupId>
   			<artifactId>jsf-api</artifactId>
  -			<scope>provided</scope>
   		</dependency>
   		
   		<dependency>
  @@ -32,13 +31,11 @@
   		<dependency>
   			<groupId>javax.servlet</groupId>
   			<artifactId>servlet-api</artifactId>
  -			<scope>provided</scope>
   		</dependency>
   		
   		<dependency>
   			<groupId>javax.el</groupId>
   			<artifactId>el-api</artifactId>
  -			<scope>provided</scope>
   		</dependency>
   		
   	</dependencies>
  
  
  
  1.7       +0 -4      jboss-seam/build/remoting.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: remoting.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/remoting.pom.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- remoting.pom.xml	21 Sep 2007 20:29:21 -0000	1.6
  +++ remoting.pom.xml	25 Sep 2007 16:13:17 -0000	1.7
  @@ -27,7 +27,6 @@
   		<dependency>
   			<groupId>dom4j</groupId>
   			<artifactId>dom4j</artifactId>
  -			<scope>provided</scope>
   			<exclusions>
   				<exclusion>
   					<groupId>junit</groupId>
  @@ -43,7 +42,6 @@
   		<dependency>
   			<groupId>org.hibernate</groupId>
   			<artifactId>hibernate</artifactId>
  -			<scope>provided</scope>
   			<optional>true</optional>
   			<exclusions>
   				<exclusion>
  @@ -64,13 +62,11 @@
   		<dependency>
   			<groupId>javax.servlet</groupId>
   			<artifactId>servlet-api</artifactId>
  -			<scope>provided</scope>
   		</dependency>
   
   		<dependency>
   			<groupId>javax.jms</groupId>
   			<artifactId>jms</artifactId>
  -			<scope>provided</scope>
   			<optional>true</optional>
   		</dependency>
   
  
  
  
  1.7       +0 -3      jboss-seam/build/pdf.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pdf.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/pdf.pom.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- pdf.pom.xml	20 Sep 2007 18:36:02 -0000	1.6
  +++ pdf.pom.xml	25 Sep 2007 16:13:17 -0000	1.7
  @@ -60,19 +60,16 @@
   		<dependency>
   			<groupId>javax.faces</groupId>
   			<artifactId>jsf-api</artifactId>
  -			<scope>provided</scope>
   		</dependency>
   
   		<dependency>
   			<groupId>javax.servlet</groupId>
   			<artifactId>servlet-api</artifactId>
  -			<scope>provided</scope>
   		</dependency>
   		
   		<dependency>
   			<groupId>javax.el</groupId>
   			<artifactId>el-api</artifactId>
  -			<scope>provided</scope>		
   		</dependency>
   		
   	</dependencies>
  
  
  
  1.9       +0 -8      jboss-seam/build/ui.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ui.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/ui.pom.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- ui.pom.xml	24 Sep 2007 10:21:13 -0000	1.8
  +++ ui.pom.xml	25 Sep 2007 16:13:17 -0000	1.9
  @@ -60,14 +60,12 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javax.servlet.jsp</groupId>
         <artifactId>jsp-api</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
  @@ -78,7 +76,6 @@
       <dependency>
         <groupId>antlr</groupId>
         <artifactId>antlr</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
  @@ -133,7 +130,6 @@
       <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>jsf-api</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
  @@ -172,7 +168,6 @@
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate</artifactId>
         <optional>true</optional>
  -      <scope>provided</scope>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>
  @@ -194,7 +189,6 @@
       <dependency>
         <groupId>javax.el</groupId>
         <artifactId>el-api</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
  @@ -215,14 +209,12 @@
       <dependency>
         <groupId>javax.persistence</groupId>
         <artifactId>persistence-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
  
  
  
  1.16      +24 -18    jboss-seam/build/core.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: core.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/core.pom.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- core.pom.xml	24 Sep 2007 11:19:22 -0000	1.15
  +++ core.pom.xml	25 Sep 2007 16:13:17 -0000	1.16
  @@ -12,7 +12,6 @@
     </parent>
   
     <!-- 
  -    * Dependencies marked provided are provided by the latest JBoss AS Seam is targeted at (default/lib or default/deploy)
       * Dependencies marked optional are provide optional features of Seam, not necessarily included in JBoss AS
     -->
   
  @@ -20,7 +19,6 @@
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
         <exclusions>
           <exclusion>
  @@ -45,7 +43,6 @@
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-annotations</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
         <exclusions>
           <exclusion>
  @@ -58,14 +55,12 @@
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javassist</groupId>
         <artifactId>javassist</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
  @@ -77,21 +72,18 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javax.xml.ws</groupId>
         <artifactId>jaxws-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
         <exclusions>
           <exclusion>
  @@ -102,23 +94,27 @@
       </dependency>
   
       <dependency>
  +      <groupId>javax.jws</groupId>
  +      <artifactId>jsr181-api</artifactId>
  +      <scope>runtime</scope>
  +      <optional>true</optional>
  +    </dependency>
  +
  +    <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>jsf-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javax.servlet.jsp</groupId>
         <artifactId>jsp-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javax.ejb</groupId>
         <artifactId>ejb-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
  @@ -177,28 +173,24 @@
       <dependency>
         <groupId>javax.xml.soap</groupId>
         <artifactId>saaj-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javax.jms</groupId>
         <artifactId>jms</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>jsr250-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
       <dependency>
         <groupId>javax.transaction</groupId>
         <artifactId>jta</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
  @@ -292,13 +284,11 @@
       <dependency>
         <groupId>javax.el</groupId>
         <artifactId>el-api</artifactId>
  -      <scope>provided</scope>
       </dependency>
   
       <dependency>
         <groupId>javax.persistence</groupId>
         <artifactId>persistence-api</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
       </dependency>
   
  @@ -442,7 +432,6 @@
       <dependency>
         <groupId>javax.faces</groupId>
         <artifactId>jsf-impl</artifactId>
  -      <scope>provided</scope>
         <optional>true</optional>
         <exclusions>
           <exclusion>
  @@ -463,6 +452,23 @@
         <optional>true</optional>
       </dependency>
   
  +    <dependency>
  +      <groupId>org.tuckey</groupId>
  +      <artifactId>urlrewritefilter</artifactId>
  +      <optional>true</optional>
  +      <scope>runtime</scope>
  +      <exclusions>
  +        <exclusion>
  +          <groupId>junit</groupId>
  +          <artifactId>junit</artifactId>
  +        </exclusion>
  +        <exclusion>
  +          <groupId>ant</groupId>
  +          <artifactId>ant</artifactId>
  +        </exclusion>
  +      </exclusions>
  +    </dependency>
  +
     </dependencies>
   
   </project>
  \ No newline at end of file
  
  
  
  1.11      +12 -0     jboss-seam/build/root.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: root.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/root.pom.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- root.pom.xml	24 Sep 2007 20:06:40 -0000	1.10
  +++ root.pom.xml	25 Sep 2007 16:13:17 -0000	1.11
  @@ -188,6 +188,12 @@
   
         <dependency>
           <groupId>org.hibernate</groupId>
  +        <artifactId>hibernate-entitymanager</artifactId>
  +        <version>3.3.1.ga</version>
  +      </dependency>
  +
  +      <dependency>
  +        <groupId>org.hibernate</groupId>
           <artifactId>hibernate-validator</artifactId>
           <version>3.0.0.GA</version>
         </dependency>
  @@ -285,6 +291,12 @@
         </dependency>
   
         <dependency>
  +        <groupId>javax.jws</groupId>
  +        <artifactId>jsr181-api</artifactId>
  +        <version>1.0-MR1</version>
  +      </dependency>
  +
  +      <dependency>
           <groupId>com.octo.captcha</groupId>
           <artifactId>jcaptcha-all</artifactId>
           <version>1.0-RC6</version>
  
  
  



More information about the jboss-cvs-commits mailing list