svn commit: r1329218 - in /cocoon: subprojects/cocoon-it-fw/ subprojects/cocoon-it-fw/branches/ subprojects/cocoon-it-fw/tags/ subprojects/cocoon-it-fw/trunk/ subprojects/cocoon-it-fw/trunk/pom.xml trunk/tools/cocoon-it-fw/ trunk/tools/pom.xml

Author: ilgrosso
Date: Mon Apr 23 12:51:08 2012
New Revision: 1329218

URL: http://svn.apache.org/viewvc?rev=1329218&view=rev
Log:
Moving cocoon-it-fw to /subprojects

Added:
    cocoon/subprojects/cocoon-it-fw/
    cocoon/subprojects/cocoon-it-fw/branches/
    cocoon/subprojects/cocoon-it-fw/tags/
    cocoon/subprojects/cocoon-it-fw/trunk/
      - copied from r1328013, cocoon/trunk/tools/cocoon-it-fw/
Removed:
    cocoon/trunk/tools/cocoon-it-fw/
Modified:
    cocoon/subprojects/cocoon-it-fw/trunk/pom.xml
    cocoon/trunk/tools/pom.xml

Modified: cocoon/subprojects/cocoon-it-fw/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-it-fw/trunk/pom.xml?rev=1329218&r1=1328013&r2=1329218&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-it-fw/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-it-fw/trunk/pom.xml Mon Apr 23 12:51:08 2012
@@ -24,14 +24,33 @@
   <packaging>maven-plugin</packaging>
 
   <parent>
-    <artifactId>cocoon-tools-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>5-SNAPSHOT</version>
+    <artifactId>cocoon</artifactId>
+    <version>9-SNAPSHOT</version>
+    <relativePath/>
   </parent>
   <artifactId>cocoon-it-fw</artifactId>
-
   <version>1.0.0-RC1-SNAPSHOT</version>
   <name>Cocoon Integration Test Framework [maven-plugin]</name>
+  
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-it-fw/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-it-fw/trunk</developerConnection>
+    <url>http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-it-fw/trunk</url>
+  </scm>
+
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <url>${docs.deploymentBaseUrl}/${docs.m.it-fw.relPath}</url>
+    </site>
+  </distributionManagement>
+  
+  <properties>
+    <docs.name>${project.name}</docs.name>
+    <docs.version>${docs.m.it-fw.version}</docs.version>
+  </properties>
+  
   <dependencies>
     <!-- The Maven 2 plugin -->
     <dependency>
@@ -57,11 +76,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>htmlunit</groupId>
       <artifactId>htmlunit</artifactId>
       <scope>compile</scope>
@@ -78,43 +92,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>  
-  <properties>
-    <docs.name>${project.name}</docs.name>
-    <docs.version>${docs.m.it-fw.version}</docs.version>
-  </properties>
-
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>${docs.deploymentBaseUrl}/${docs.m.it-fw.relPath}</url>
-    </site>
-  </distributionManagement>
-
-  <profiles>
-    <profile>
-      <id>daisy</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.daisycms</groupId>
-            <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>
-              <navDocId>1433</navDocId>
-              <collection>cdocs-it-fw</collection>
-      	      <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
-      	    </configuration>
-      	  </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?rev=1329218&r1=1329217&r2=1329218&view=diff
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Mon Apr 23 12:51:08 2012
@@ -37,7 +37,6 @@
     <module>archetypes/cocoon-22-archetype-block</module>
     <module>archetypes/cocoon-22-archetype-block-plain</module>    
     <module>archetypes/cocoon-22-archetype-webapp</module>    
-    <module>cocoon-it-fw</module>    
     <module>cocoon-maven-reports</module>
     <module>cocoon-maven-plugin</module>
     <module>cocoon-maven-docs-cleaner-plugin</module>