You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jm...@apache.org on 2006/05/04 19:01:18 UTC

svn commit: r399765 - in /maven/archetype/branches/archetype-1.0.x/maven-archetypes: maven-archetype-j2ee-simple/ maven-archetype-j2ee-simple/src/ maven-archetype-j2ee-simple/src/main/ maven-archetype-j2ee-simple/src/main/resources/ maven-archetype-j2e...

Author: jmcconnell
Date: Thu May  4 10:01:09 2006
New Revision: 399765

URL: http://svn.apache.org/viewcvs?rev=399765&view=rev
Log:
merged -r397247:397248 and -r397244:397245 from trunk, the rename of the archetype and marchetype-10

Added:
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/   (props changed)
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/META-INF/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/META-INF/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/META-INF/archetype.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/META-INF/archetype.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/main/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/main/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/main/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/main/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/test/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/test/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/test/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/src/test/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/resources/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/resources/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/resources/META-INF/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/resources/META-INF/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/resources/META-INF/ejb-jar.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/main/resources/META-INF/ejb-jar.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/test/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/test/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/test/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/src/test/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/main/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/main/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/main/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/main/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/test/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/test/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/test/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/src/test/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/main/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/main/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/main/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/main/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/test/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/test/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/test/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/src/test/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/java/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/webapp/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/webapp/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/webapp/WEB-INF/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/webapp/WEB-INF/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/webapp/WEB-INF/web.xml
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/webapp/WEB-INF/web.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/webapp/index.jsp
      - copied unchanged from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/main/webapp/index.jsp
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/test/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/test/
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/test/java/
      - copied from r397247, maven/archetype/trunk/maven-archetypes/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/src/test/java/
Modified:
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ear/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ejbs/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/primary-source/pom.xml
    maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/servlets/pom.xml

Propchange: maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee-simple/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May  4 10:01:09 2006
@@ -0,0 +1 @@
+target

Modified: maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ear/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ear/pom.xml?rev=399765&r1=399764&r2=399765&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ear/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ear/pom.xml Thu May  4 10:01:09 2006
@@ -29,18 +29,6 @@
          <groupId>root.project.projects</groupId>
          <artifactId>logging</artifactId>
       </dependency>
-      <dependency>
-         <groupId>fop</groupId>
-         <artifactId>fop</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>axis</groupId>
-         <artifactId>axis</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>axis</groupId>
-         <artifactId>axis-wsdl4j</artifactId>
-      </dependency>
    </dependencies>
    <build>
       <plugins>

Modified: maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ejbs/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ejbs/pom.xml?rev=399765&r1=399764&r2=399765&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ejbs/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/ejbs/pom.xml Thu May  4 10:01:09 2006
@@ -19,11 +19,6 @@
          <groupId>root.project.projects</groupId>
          <artifactId>logging</artifactId>
       </dependency>
-      <dependency>
-         <groupId>fop</groupId>
-         <artifactId>fop</artifactId>
-         <scope>provided</scope>
-      </dependency>
   </dependencies>
    <build>
       <plugins>

Modified: maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/pom.xml?rev=399765&r1=399764&r2=399765&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/pom.xml Thu May  4 10:01:09 2006
@@ -50,21 +50,6 @@
             <version>1.0</version>
             <type>ejb</type>
          </dependency>
-         <dependency>
-            <groupId>fop</groupId>
-            <artifactId>fop</artifactId>
-            <version>0.20.5</version>
-         </dependency>
-         <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>1.2.1</version>
-         </dependency>
-         <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-wsdl4j</artifactId>
-            <version>1.5.1</version>
-         </dependency>
       </dependencies>
    </dependencyManagement>
    <distributionManagement>

Modified: maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/primary-source/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/primary-source/pom.xml?rev=399765&r1=399764&r2=399765&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/primary-source/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/primary-source/pom.xml Thu May  4 10:01:09 2006
@@ -13,22 +13,7 @@
       <dependency>
          <groupId>root.project.projects</groupId>
          <artifactId>logging</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>fop</groupId>
-         <artifactId>fop</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>axis</groupId>
-         <artifactId>axis</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>axis</groupId>
-         <artifactId>axis-wsdl4j</artifactId>
-         <scope>provided</scope>
-      </dependency>
+      </dependency>                  
    </dependencies>
    <build>
       <plugins>

Modified: maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/servlets/pom.xml
URL: http://svn.apache.org/viewcvs/maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/servlets/pom.xml?rev=399765&r1=399764&r2=399765&view=diff
==============================================================================
--- maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/servlets/pom.xml (original)
+++ maven/archetype/branches/archetype-1.0.x/maven-archetypes/maven-archetype-j2ee/src/main/resources/archetype-resources/servlets/pom.xml Thu May  4 10:01:09 2006
@@ -10,12 +10,6 @@
       <artifactId>project</artifactId>
       <version>1.0</version>
    </parent>
-   <dependencies>
-      <dependency>
-         <groupId>fop</groupId>
-         <artifactId>fop</artifactId>
-      </dependency>
-   </dependencies>
    <modules>
       <module>servlet</module>
    </modules>