You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2012/02/18 15:57:56 UTC
svn commit: r1245936 - in /cocoon/cocoon3/trunk: cocoon-databases-sample/
cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/
cocoon-databases/ cocoon-rest-optional/
cocoon-rest-optional/src/main/java/org/apache/cocoon/ cocoon-rest-optio...
Author: ilgrosso
Date: Sat Feb 18 14:57:56 2012
New Revision: 1245936
URL: http://svn.apache.org/viewvc?rev=1245936&view=rev
Log:
COCOON3-80 #resolve
Added:
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/
- copied from r1245930, cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/
Removed:
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocooon/
Modified:
cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml
cocoon/cocoon3/trunk/cocoon-databases-sample/rcl.properties
cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
cocoon/cocoon3/trunk/cocoon-databases/pom.xml
cocoon/cocoon3/trunk/cocoon-databases/rcl.properties
cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml
cocoon/cocoon3/trunk/cocoon-rest-optional/rcl.properties
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/AbstractAsyncronService.java
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/App.java
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/sample/ProgressService.java
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
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
Modified: cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml?rev=1245936&r1=1245935&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml Sat Feb 18 14:57:56 2012
@@ -24,7 +24,7 @@
<groupId>org.apache.cocoon.databases-sample</groupId>
<artifactId>cocoon-databases-sample</artifactId>
<name>Apache Cocoon 3: Databases sample integration</name>
- <description>org.cocooon.databases.sample: shows the usage of db in cocoon</description>
+ <description>org.cocoon.databases.sample: shows the usage of db in cocoon</description>
<properties>
<cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
Modified: cocoon/cocoon3/trunk/cocoon-databases-sample/rcl.properties
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases-sample/rcl.properties?rev=1245936&r1=1245935&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases-sample/rcl.properties (original)
+++ cocoon/cocoon3/trunk/cocoon-databases-sample/rcl.properties Sat Feb 18 14:57:56 2012
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-org.cocooon.databases.sample.cocoon-databases-sample.service%classes-dir=./target/classes
\ No newline at end of file
+org.cocoon.databases.sample.cocoon-databases-sample.service%classes-dir=./target/classes
\ No newline at end of file
Modified: cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml?rev=1245936&r1=1245935&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml Sat Feb 18 14:57:56 2012
@@ -24,7 +24,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
- <bean name="org.cocooon.databases.sample.cocoon-databases-sample.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
+ <bean name="org.cocoon.databases.sample.cocoon-databases-sample.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
<servlet:context mount-path="" context-path="blockcontext:/cocoon-databases-sample/"/>
</bean>
Modified: cocoon/cocoon3/trunk/cocoon-databases/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases/pom.xml?rev=1245936&r1=1245935&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-databases/pom.xml Sat Feb 18 14:57:56 2012
@@ -30,7 +30,7 @@
<groupId>org.apache.cocoon.databases</groupId>
<artifactId>cocoon-databases</artifactId>
<name>Apache cocoon 3: Databases integration components</name>
- <description>org.cocooon.rest.optional:cocoon-databases:3.0.0-beta-1-SNAPSHOT</description>
+ <description>org.cocoon.rest.optional:cocoon-databases:3.0.0-beta-1-SNAPSHOT</description>
<build>
<plugins>
<plugin>
Modified: cocoon/cocoon3/trunk/cocoon-databases/rcl.properties
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases/rcl.properties?rev=1245936&r1=1245935&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases/rcl.properties (original)
+++ cocoon/cocoon3/trunk/cocoon-databases/rcl.properties Sat Feb 18 14:57:56 2012
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-org.cocooon.rest.optional.cocoon-rest-optional.service%classes-dir=./target/classes
\ No newline at end of file
+org.cocoon.rest.optional.cocoon-rest-optional.service%classes-dir=./target/classes
\ No newline at end of file
Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml?rev=1245936&r1=1245935&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml Sat Feb 18 14:57:56 2012
@@ -30,7 +30,7 @@
<artifactId>cocoon-rest-optional</artifactId>
<groupId>org.apache.cocoon.rest.optional</groupId>
<name>Apache cocoon 3: Optional REST components</name>
- <description>org.cocooon.rest.optional:cocoon-rest-optional:3.0.0-beta-1-SNAPSHOT</description>
+ <description>org.cocoon.rest.optional:cocoon-rest-optional:3.0.0-beta-1-SNAPSHOT</description>
<build>
<plugins>
<plugin>
Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/rcl.properties
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/rcl.properties?rev=1245936&r1=1245935&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/rcl.properties (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/rcl.properties Sat Feb 18 14:57:56 2012
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-org.cocooon.rest.optional.cocoon-rest-optional.service%classes-dir=./target/classes
\ No newline at end of file
+org.cocoon.rest.optional.cocoon-rest-optional.service%classes-dir=./target/classes
\ No newline at end of file
Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/AbstractAsyncronService.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/AbstractAsyncronService.java?rev=1245936&r1=1245930&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/AbstractAsyncronService.java (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/AbstractAsyncronService.java Sat Feb 18 14:57:56 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocooon.rest.optional;
+package org.apache.cocoon.rest.optional;
import java.util.concurrent.Executor;
Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/App.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/App.java?rev=1245936&r1=1245930&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/App.java (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/App.java Sat Feb 18 14:57:56 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocooon.rest.optional;
+package org.apache.cocoon.rest.optional;
/**
* Hello world!
Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/sample/ProgressService.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/sample/ProgressService.java?rev=1245936&r1=1245930&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/sample/ProgressService.java (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/java/org/apache/cocoon/rest/optional/sample/ProgressService.java Sat Feb 18 14:57:56 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cocooon.rest.optional.sample;
+package org.apache.cocoon.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.apache.cocooon.rest.optional.AbstractAsyncronService;
+import org.apache.cocoon.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=1245936&r1=1245935&r2=1245936&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 Sat Feb 18 14:57:56 2012
@@ -20,7 +20,7 @@
</map:match>
<map:match pattern="rest/*">
<controller:call controller="rest-controller"
- select="org.apache.cocooon.rest.optional.sample.{map:1}" />
+ select="org.apache.cocoon.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=1245936&r1=1245935&r2=1245936&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 Sat Feb 18 14:57:56 2012
@@ -9,20 +9,18 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<!-- $Id: block-application-context.xml 697547 2008-09-21 16:52:48Z reinhard
- $ -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util"
xmlns:pipeline="http://cocoon.apache.org/schema/pipeline"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- 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://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
http://cocoon.apache.org/schema/pipeline http://cocoon.apache.org/schema/pipeline/cocoon-pipeline-1.0.xsd">
- <context:component-scan base-package="org.apache.cocooon.rest.optional.sample"
+ <context:component-scan base-package="org.apache.cocoon.rest.optional.sample"
use-default-filters="false"
name-generator="org.apache.cocoon.rest.controller.ControllerBeanNameGenerator"
scope-resolver="org.apache.cocoon.rest.controller.ControllerBeanScopeResolver">
Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml?rev=1245936&r1=1245935&r2=1245936&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml Sat Feb 18 14:57:56 2012
@@ -24,7 +24,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
- <bean name="org.cocooon.rest.optional.cocoon-rest-optional.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
+ <bean name="org.cocoon.rest.optional.cocoon-rest-optional.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
<servlet:context mount-path="" context-path="blockcontext:/cocoon-rest-optional/"/>
</bean>