cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r684225 - in /cocoon/whiteboard/corona/trunk: ./ corona-pipeline/src/main/java/cc/cerebro/client/web/generator/ corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/ corona-pipeline/src/test/resources/ corona-rest/s...
Date Sat, 09 Aug 2008 11:08:14 GMT
Author: reinhard
Date: Sat Aug  9 04:08:13 2008
New Revision: 684225

URL: http://svn.apache.org/viewvc?rev=684225&view=rev
Log:
add RAT plugin and fix all warnings; make parent/pom.xml the root POM

Added:
    cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java   (contents, props changed)
      - copied, changed from r683394, cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/cc/cerebro/client/web/generator/StringTemplateGenerator.java
    cocoon/whiteboard/corona/trunk/parent/it.bat   (with props)
Removed:
    cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/cc/
    cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/resources/corona-controller-1.0.xsd
    cocoon/whiteboard/corona/trunk/pom.xml
Modified:
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/cc/cerebro/client/web/generator/ParameterCacheKey.java
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java
    cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/resources/test.xml
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanNameGenerator.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanScopeResolver.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/MethodDelegator.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/BaseURL.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/Inject.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RESTController.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestHeader.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestParameter.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/SitemapParameter.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Delete.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Get.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Head.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Options.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Post.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Put.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Page.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/RestResponse.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Status.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/util/AnnotationCollector.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedClass.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedSuperClass.java
    cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotationCollectorTest.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/controller/ControllerContextHelper.java
    cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/expression/LanguageInterpreter.java
    cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/resources/META-INF/cocoon/spring/corona-stringtemplate-sitemap-components.xml
    cocoon/whiteboard/corona/trunk/parent/pom.xml

Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/cc/cerebro/client/web/generator/ParameterCacheKey.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/cc/cerebro/client/web/generator/ParameterCacheKey.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/cc/cerebro/client/web/generator/ParameterCacheKey.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/cc/cerebro/client/web/generator/ParameterCacheKey.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package cc.cerebro.client.web.generator;
 
 import java.util.Map;

Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/main/java/org/apache/cocoon/corona/pipeline/component/sax/CleaningTransformer.java Sat Aug  9 04:08:13 2008
@@ -86,7 +86,8 @@
         }
 
         for (int i = 0; i < this.position; i++) {
-            if (!Character.isWhitespace(this.characters[i])) {
+            char eachChar = this.characters[i];
+            if (!Character.isWhitespace(eachChar) || eachChar == '\u00A0') {
                 super.characters(this.characters, 0, this.position);
                 break;
             }

Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/resources/test.xml?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/resources/test.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/src/test/resources/test.xml Sat Aug  9 04:08:13 2008
@@ -1 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the 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.
+-->
 <test/>
\ No newline at end of file

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanNameGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanNameGenerator.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanNameGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanNameGenerator.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller;
 
 import org.springframework.beans.factory.config.BeanDefinition;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanScopeResolver.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanScopeResolver.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanScopeResolver.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/ControllerBeanScopeResolver.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller;
 
 import org.springframework.beans.factory.config.BeanDefinition;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/MethodDelegator.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/MethodDelegator.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/MethodDelegator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/MethodDelegator.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller;
 
 import java.util.HashMap;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller;
 
 import java.io.IOException;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/BaseURL.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/BaseURL.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/BaseURL.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/BaseURL.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.annotation;
 
 import java.lang.annotation.ElementType;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/Inject.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/Inject.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/Inject.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/Inject.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.annotation;
 
 import java.lang.annotation.ElementType;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RESTController.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RESTController.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RESTController.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RESTController.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.annotation;
 
 import java.lang.annotation.ElementType;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestHeader.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestHeader.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestHeader.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestHeader.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.annotation;
 
 import java.lang.annotation.ElementType;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestParameter.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestParameter.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestParameter.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/RequestParameter.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.annotation;
 
 import java.lang.annotation.ElementType;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/SitemapParameter.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/SitemapParameter.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/SitemapParameter.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/annotation/SitemapParameter.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.annotation;
 
 import java.lang.annotation.ElementType;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Delete.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Delete.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Delete.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Delete.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.method;
 
 import org.apache.cocoon.corona.rest.controller.response.RestResponse;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Get.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Get.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Get.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Get.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.method;
 
 import org.apache.cocoon.corona.rest.controller.response.RestResponse;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Head.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Head.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Head.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Head.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.method;
 
 import org.apache.cocoon.corona.rest.controller.response.RestResponse;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Options.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Options.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Options.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Options.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.method;
 
 import org.apache.cocoon.corona.rest.controller.response.RestResponse;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Post.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Post.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Post.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Post.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.method;
 
 import org.apache.cocoon.corona.rest.controller.response.RestResponse;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Put.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Put.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Put.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/method/Put.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.method;
 
 import org.apache.cocoon.corona.rest.controller.response.RestResponse;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Page.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Page.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Page.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Page.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.response;
 
 import java.util.HashMap;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/RestResponse.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/RestResponse.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/RestResponse.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/RestResponse.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.response;
 
 public interface RestResponse {

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Status.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Status.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Status.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/controller/response/Status.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.controller.response;
 
 public class Status implements RestResponse {

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/util/AnnotationCollector.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/util/AnnotationCollector.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/util/AnnotationCollector.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/main/java/org/apache/cocoon/corona/rest/util/AnnotationCollector.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.util;
 
 import java.lang.annotation.Annotation;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedClass.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedClass.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedClass.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedClass.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.util;
 
 import org.apache.cocoon.corona.rest.controller.annotation.RequestHeader;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedSuperClass.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedSuperClass.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedSuperClass.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotatedSuperClass.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.util;
 
 import org.apache.cocoon.corona.rest.controller.annotation.RequestParameter;

Modified: cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotationCollectorTest.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotationCollectorTest.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotationCollectorTest.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-rest/src/test/java/org/apache/cocoon/corona/rest/util/AnnotationCollectorTest.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.rest.util;
 
 import java.lang.annotation.Annotation;

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/controller/ControllerContextHelper.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/controller/ControllerContextHelper.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/controller/ControllerContextHelper.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/controller/ControllerContextHelper.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.servlet.controller;
 
 import java.util.Collections;

Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/expression/LanguageInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/expression/LanguageInterpreter.java?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/expression/LanguageInterpreter.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/java/org/apache/cocoon/corona/sitemap/expression/LanguageInterpreter.java Sat Aug  9 04:08:13 2008
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
 package org.apache.cocoon.corona.sitemap.expression;
 
 import org.apache.cocoon.corona.sitemap.objectmodel.ObjectModel;

Copied: cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java (from r683394, cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/cc/cerebro/client/web/generator/StringTemplateGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java?p2=cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java&p1=cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/cc/cerebro/client/web/generator/StringTemplateGenerator.java&r1=683394&r2=684225&rev=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/cc/cerebro/client/web/generator/StringTemplateGenerator.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java Sat Aug  9 04:08:13 2008
@@ -1,4 +1,20 @@
-package cc.cerebro.client.web.generator;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the 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.
+ */
+package org.apache.cocoon.corona.stringtemplate;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,6 +37,8 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
+import cc.cerebro.client.web.generator.ParameterCacheKey;
+
 public class StringTemplateGenerator extends AbstractXMLProducer implements Starter, CachingPipelineComponent {
 
     private URL source;

Propchange: cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/resources/META-INF/cocoon/spring/corona-stringtemplate-sitemap-components.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/resources/META-INF/cocoon/spring/corona-stringtemplate-sitemap-components.xml?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/resources/META-INF/cocoon/spring/corona-stringtemplate-sitemap-components.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/resources/META-INF/cocoon/spring/corona-stringtemplate-sitemap-components.xml Sat Aug  9 04:08:13 2008
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the 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$ -->
 <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"
@@ -6,6 +22,6 @@
   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">
 
-  <bean name="generator:string-template" class="cc.cerebro.client.web.generator.StringTemplateGenerator" scope="prototype" />
+  <bean name="generator:string-template" class="org.apache.cocoon.corona.stringtemplate.StringTemplateGenerator" scope="prototype" />
 
 </beans>

Added: cocoon/whiteboard/corona/trunk/parent/it.bat
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/parent/it.bat?rev=684225&view=auto
==============================================================================
--- cocoon/whiteboard/corona/trunk/parent/it.bat (added)
+++ cocoon/whiteboard/corona/trunk/parent/it.bat Sat Aug  9 04:08:13 2008
@@ -0,0 +1,18 @@
+@echo off
+REM  Licensed to the Apache Software Foundation (ASF) under one
+REM  or more contributor license agreements.  See the NOTICE file
+REM  distributed with this work for additional information
+REM  regarding copyright ownership.  The ASF licenses this file
+REM  to you under the Apache License, Version 2.0 (the
+REM  "License"); you may not use this file except in compliance
+REM  with the License.  You may obtain a copy of the License at
+REM 
+REM       http://www.apache.org/licenses/LICENSE-2.0
+REM 
+REM  Unless required by applicable law or agreed to in writing,
+REM  software distributed under the License is distributed on an
+REM  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM  KIND, either express or implied.  See the License for the
+REM  specific language governing permissions and limitations
+REM  under the License.
+mvn clean install -P it -Dhtmlunit.base-url=http://localhost:8888
\ No newline at end of file

Propchange: cocoon/whiteboard/corona/trunk/parent/it.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/corona/trunk/parent/it.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cocoon/whiteboard/corona/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/parent/pom.xml?rev=684225&r1=684224&r2=684225&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/parent/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/parent/pom.xml Sat Aug  9 04:08:13 2008
@@ -29,6 +29,16 @@
   <name>Cocoon Corona: Parent [pom]</name>
   <description>Cocoon Corona Parent POM module contains all basic configurations for the Maven 2 based build system.</description>
   <inceptionYear>2008</inceptionYear>
+  
+  <modules>
+    <module>../corona-controller</module>        
+    <module>../corona-pipeline</module>
+    <module>../corona-rest</module>
+    <module>../corona-sample</module>         
+    <module>../corona-servlet</module>    
+    <module>../corona-sitemap</module>
+    <module>../corona-stringtemplate</module>    
+  </modules>  
 
   <dependencyManagement>
     <dependencies>
@@ -246,6 +256,11 @@
           <target>1.5</target>
         </configuration>
       </plugin>  
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <version>1.0-alpha-3</version>
+      </plugin>      
     </plugins>
     <pluginManagement>
       <plugins>
@@ -368,6 +383,18 @@
               </archive>
             </configuration>
           </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rat-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>          
         </plugins>
       </build>
     </profile>
@@ -388,5 +415,45 @@
         </pluginRepository>
       </pluginRepositories>
     </profile>    
+    <profile>
+      <id>all</id>
+      <modules>
+        <module>../corona-docs</module>    
+        <module>../corona-sample-webapp</module>
+        </modules>
+    </profile>    
+    <profile>
+      <id>it</id>
+      <modules>
+        <module>../corona-sample-webapp</module>
+      </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rat-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>          
+        </plugins>
+      </build>        
+    </profile>    
+    <profile>
+      <id>reports</id>
+      <reporting>
+        <plugins>
+          <plugin>
+            <artifactId>maven-project-info-reports-plugin</artifactId>
+            <version>2.0.1</version>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>           
   </profiles>
 </project>



Mime
View raw message