fix building a .war for these two, and make dependencies work for com…

…piling from command line.
weld · Apr 16, 2009 · 12f8602 · 12f8602
1 parent c607c7f
commit 12f8602
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/wicket/conversations/pom.xml b/wicket/conversations/pom.xml
@@ -36,14 +36,12 @@
       <dependency>
          <groupId>org.jboss.webbeans.tomcat</groupId>
          <artifactId>webbeans-tomcat</artifactId>
-         <scope>runtime</scope>
       </dependency>
 
 	  <dependency>
 	  	<groupId>org.jboss.webbeans</groupId>
 	  	<artifactId>webbeans-wicket</artifactId>
 	    <version>1.0.0-SNAPSHOT</version>
-		  <scope>runtime</scope>
 	  </dependency>
 
 		<dependency>
@@ -114,6 +112,22 @@
         <artifactId>maven-eclipse-plugin</artifactId> 
         <version>2.5.1</version> 
       </plugin> 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>src/main/webapp/WEB-INF</directory>
+              <targetPath>WEB-INF</targetPath>
+              <includes>
+                <include>**/beans.xml</include>
+                <include>**/web.xml</include>
+              </includes>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
 		</plugins>
 	</build>
 

diff --git a/wicket/conversations/src/main/resources/beans.xml b/wicket/conversations/src/main/resources/beans.xml
@@ -1,7 +0,0 @@
-<Beans xmlns="urn:java:ee" xmlns:conversations="urn:java:org.jboss.webbeans.examples.conversations">
-  <Deploy>
-    <Standard />
-    <Production />
-    <conversations:Example />
-  </Deploy>
-</Beans>

diff --git a/wicket/numberguess/pom.xml b/wicket/numberguess/pom.xml
@@ -43,7 +43,6 @@
 	  	<groupId>org.jboss.webbeans</groupId>
 	  	<artifactId>webbeans-wicket</artifactId>
 	    <version>1.0.0-SNAPSHOT</version>
-		  <scope>runtime</scope>
 	  </dependency>
 
 		<dependency>
@@ -114,6 +113,22 @@
             <artifactId>maven-eclipse-plugin</artifactId> 
             <version>2.5.1</version> 
           </plugin> 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>src/main/webapp/WEB-INF</directory>
+              <targetPath>WEB-INF</targetPath>
+              <includes>
+                <include>**/beans.xml</include>
+                <include>**/web.xml</include>
+              </includes>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
 		</plugins>
 	</build>