svn commit: r1328001 - in /cocoon: subprojects/cocoon-servlet-service-impl/ subprojects/cocoon-servlet-service-impl/branches/ subprojects/cocoon-servlet-service-impl/tags/ subprojects/cocoon-servlet-service-impl/trunk/ trunk/subprojects/ trunk/subproje...

Author: ilgrosso
Date: Thu Apr 19 15:34:10 2012
New Revision: 1328001

URL: http://svn.apache.org/viewvc?rev=1328001&view=rev
Log:
Moving cocoon-servlet-service-impl to /subprojects

Added:
    cocoon/subprojects/cocoon-servlet-service-impl/
    cocoon/subprojects/cocoon-servlet-service-impl/branches/
    cocoon/subprojects/cocoon-servlet-service-impl/tags/
    cocoon/subprojects/cocoon-servlet-service-impl/trunk/
      - copied from r1327994, cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl/
Removed:
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl/
Modified:
    cocoon/subprojects/cocoon-servlet-service-impl/trunk/pom.xml
    cocoon/trunk/subprojects/pom.xml

Modified: cocoon/subprojects/cocoon-servlet-service-impl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-servlet-service-impl/trunk/pom.xml?rev=1328001&r1=1327994&r2=1328001&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-servlet-service-impl/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-servlet-service-impl/trunk/pom.xml Thu Apr 19 15:34:10 2012
@@ -24,12 +24,12 @@
   <parent>
     <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../../parent/pom.xml</relativePath>
+    <version>9-SNAPSHOT</version>
+    <relativePath/>
   </parent>
   <artifactId>cocoon-servlet-service-impl</artifactId>
   <packaging>jar</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.3.1-SNAPSHOT</version>
   <name>Cocoon Servlet Service Implementation</name>
   <description>
     The servlet service framework makes it easy to use servlets as Spring components.
@@ -43,6 +43,12 @@
     <docs.version>${docs.m.servlet-service-impl.version}</docs.version>
     <docs.urlRelativizer>../../../../../</docs.urlRelativizer>
   </properties>
+  
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-servlet-service-impl/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-servlet-service-impl/trunk</developerConnection>
+    <url>http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-servlet-service-impl/trunk</url>
+  </scm>
 
   <distributionManagement>
     <site>
@@ -114,14 +120,6 @@
   </dependencies>
 
   <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-servlet-service/${project.artifactId}</tagBase>
-        </configuration>
-      </plugin>
-    </plugins>
     <resources>
       <resource>
         <directory>src/main/resources</directory>
@@ -138,12 +136,6 @@
     </resources>
   </build>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</developerConnection>
-    <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/</url>
-  </scm>
-
   <reporting>
     <plugins>
       <plugin>
@@ -174,23 +166,4 @@
     </plugins>
   </reporting>
 
-  <profiles>
-    <profile>
-      <id>daisy</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.daisycms</groupId>
-            <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>
-              <navDocId>1413</navDocId>
-              <collection>cdocs-servlet-service-impl</collection>
-              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>

Modified: cocoon/trunk/subprojects/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/pom.xml?rev=1328001&r1=1328000&r2=1328001&view=diff
==============================================================================
--- cocoon/trunk/subprojects/pom.xml (original)
+++ cocoon/trunk/subprojects/pom.xml Thu Apr 19 15:34:10 2012
@@ -34,8 +34,6 @@
   <name>Cocoon Subprojects [modules]</name>
 
   <modules>
-    <module>cocoon-block-deployment</module>
-    <module>cocoon-servlet-service/cocoon-servlet-service-impl</module>
     <module>cocoon-servlet-service/cocoon-servlet-service-impl-sample</module>
   </modules>