cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r1166741 - in /cocoon/cocoon3/trunk/cocoon-rest-optional: ./ src/main/java/org/apache/ src/main/java/org/apache/cocooon/ src/main/java/org/apache/cocooon/rest/optional/ src/main/java/org/apache/cocooon/rest/optional/sample/ src/main/java/or...
Date Thu, 08 Sep 2011 15:18:01 GMT
Author: thorsten
Date: Thu Sep  8 15:18:00 2011
New Revision: 1166741

URL: http://svn.apache.org/viewvc?rev=1166741&view=rev
Log:
Fixing package location (there was a missing apache part) and removing already declared versions

Added:
    cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/
    cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/
      - copied from r1166718, cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/cocooon/
Modified:
    cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml
    cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/AbstractAsyncronService.java
    cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/App.java
    cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/sample/ProgressService.java
    cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/cocooon/
    cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/COB-INF/sitemap.xmap
    cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-application-context.xml

Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml?rev=1166741&r1=1166740&r2=1166741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml Thu Sep  8 15:18:00 2011
@@ -27,7 +27,6 @@
     <version>3.0.0-beta-1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
-  <groupId>org.cocooon.rest.optional</groupId>
   <artifactId>cocoon-rest-optional</artifactId>
   <name>Apache cocoon 3: cocoon-rest-optional</name>
   <description>org.cocooon.rest.optional:cocoon-rest-optional:3.0.0-beta-1-SNAPSHOT</description>
@@ -35,12 +34,10 @@
     <plugins>
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.8</version>
       </plugin>
       <plugin>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-maven-plugin</artifactId>
-        <version>1.0.0</version>
         <executions>
           <execution>
             <phase>compile</phase>
@@ -57,7 +54,6 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.7</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -77,7 +73,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <archive>
             <manifestEntries>

Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/AbstractAsyncronService.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/AbstractAsyncronService.java?rev=1166741&r1=1166718&r2=1166741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/AbstractAsyncronService.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/AbstractAsyncronService.java
Thu Sep  8 15:18:00 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.cocooon.rest.optional;
+package org.apache.cocooon.rest.optional;
 
 import java.util.concurrent.Executor;
 

Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/App.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/App.java?rev=1166741&r1=1166718&r2=1166741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/App.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/App.java
Thu Sep  8 15:18:00 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.cocooon.rest.optional;
+package org.apache.cocooon.rest.optional;
 
 /**
  * Hello world!

Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/sample/ProgressService.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/sample/ProgressService.java?rev=1166741&r1=1166718&r2=1166741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/sample/ProgressService.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/rest/optional/sample/ProgressService.java
Thu Sep  8 15:18:00 2011
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.cocooon.rest.optional.sample;
+package org.apache.cocooon.rest.optional.sample;
 
 import org.apache.cocoon.rest.controller.annotation.RESTController;
 import org.apache.cocoon.rest.controller.response.RestResponse;
 import org.apache.cocoon.rest.controller.response.TextResponse;
-import org.cocooon.rest.optional.AbstractAsyncronService;
+import org.apache.cocooon.rest.optional.AbstractAsyncronService;
 
 @RESTController
 public class ProgressService extends AbstractAsyncronService {

Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/COB-INF/sitemap.xmap?rev=1166741&r1=1166740&r2=1166741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/COB-INF/sitemap.xmap Thu
Sep  8 15:18:00 2011
@@ -20,7 +20,7 @@
       </map:match>
       <map:match pattern="rest/*">
         <controller:call controller="rest-controller"
-          select="org.cocooon.rest.optional.sample.{map:1}" />
+          select="org.apache.cocooon.rest.optional.sample.{map:1}" />
       </map:match>
       <map:match pattern="**">
         <map:read src="{map:1}" />

Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-application-context.xml?rev=1166741&r1=1166740&r2=1166741&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-application-context.xml
Thu Sep  8 15:18:00 2011
@@ -22,7 +22,7 @@
   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
   http://cocoon.apache.org/schema/pipeline http://cocoon.apache.org/schema/pipeline/cocoon-pipeline-1.0.xsd">
-  <context:component-scan base-package="org.cocooon.rest.optional.sample"
+  <context:component-scan base-package="org.apache.cocooon.rest.optional.sample"
     use-default-filters="false"
     name-generator="org.apache.cocoon.rest.controller.ControllerBeanNameGenerator"
     scope-resolver="org.apache.cocoon.rest.controller.ControllerBeanScopeResolver">



Mime
View raw message