svn commit: r1328004 - in /cocoon: subprojects/cocoon-servlet-service-impl-sample/ subprojects/cocoon-servlet-service-impl-sample/branches/ subprojects/cocoon-servlet-service-impl-sample/tags/ subprojects/cocoon-servlet-service-impl-sample/trunk/ trunk...

Author: ilgrosso
Date: Thu Apr 19 15:39:44 2012
New Revision: 1328004

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

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

Modified: cocoon/subprojects/cocoon-servlet-service-impl-sample/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-servlet-service-impl-sample/trunk/pom.xml?rev=1328004&r1=1328001&r2=1328004&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-servlet-service-impl-sample/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-servlet-service-impl-sample/trunk/pom.xml Thu Apr 19 15:39:44 2012
@@ -26,24 +26,30 @@
   <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-sample</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <name>Cocoon Servlet Service Implementation Sample Blocks</name>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-servlet-service-impl-sample/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-servlet-service-impl-sample/trunk</developerConnection>
+    <url>http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-servlet-service-impl-sample/trunk</url>
+  </scm>
+  
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.4</version>
         <configuration>
           <archive>
             <manifestEntries>
-              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+              <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
             </manifestEntries>
           </archive>
         </configuration>
@@ -51,7 +57,7 @@
       <plugin>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-maven-plugin</artifactId>
-        <version>1.0.0-M3</version>
+        <version>1.0.0</version>
         <configuration>
           <webappProfile>ssf</webappProfile>
         </configuration>
@@ -59,7 +65,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.7</version>
+        <version>6.1.26</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -98,10 +104,4 @@
     </dependency>
   </dependencies>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/</developerConnection>
-    <url>http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/</url>
-  </scm>
-
 </project>

Modified: cocoon/trunk/subprojects/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/pom.xml?rev=1328004&r1=1328003&r2=1328004&view=diff
==============================================================================
--- cocoon/trunk/subprojects/pom.xml (original)
+++ cocoon/trunk/subprojects/pom.xml Thu Apr 19 15:39:44 2012
@@ -33,8 +33,4 @@
   <version>6-SNAPSHOT</version>
   <name>Cocoon Subprojects [modules]</name>
 
-  <modules>
-    <module>cocoon-servlet-service/cocoon-servlet-service-impl-sample</module>
-  </modules>
-  
 </project>