You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2021/01/05 14:56:20 UTC
svn commit: r1885150 - in /turbine/core/branches/URLMapperService/src:
java/org/apache/turbine/services/urlmapper/
java/org/apache/turbine/services/urlmapper/model/
test/org/apache/turbine/services/urlmapper/
Author: tv
Date: Tue Jan 5 14:56:20 2021
New Revision: 1885150
URL: http://svn.apache.org/viewvc?rev=1885150&view=rev
Log:
Add missing headers
Modified:
turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/MappedTemplateLink.java
turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java
turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/URLMapperService.java
turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java
turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java
turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java
turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java
turbine/core/branches/URLMapperService/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperServiceTest.java
Modified: turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/MappedTemplateLink.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/MappedTemplateLink.java?rev=1885150&r1=1885149&r2=1885150&view=diff
==============================================================================
--- turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/MappedTemplateLink.java (original)
+++ turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/MappedTemplateLink.java Tue Jan 5 14:56:20 2021
@@ -1,5 +1,23 @@
package org.apache.turbine.services.urlmapper;
+/*
+ * 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.
+ */
import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.services.pull.tools.TemplateLink;
Modified: turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java?rev=1885150&r1=1885149&r2=1885150&view=diff
==============================================================================
--- turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java (original)
+++ turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java Tue Jan 5 14:56:20 2021
@@ -1,5 +1,24 @@
package org.apache.turbine.services.urlmapper;
+/*
+ * 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.
+ */
+
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
Modified: turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/URLMapperService.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/URLMapperService.java?rev=1885150&r1=1885149&r2=1885150&view=diff
==============================================================================
--- turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/URLMapperService.java (original)
+++ turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/URLMapperService.java Tue Jan 5 14:56:20 2021
@@ -1,8 +1,5 @@
package org.apache.turbine.services.urlmapper;
-import org.apache.fulcrum.parser.ParameterParser;
-import org.apache.turbine.services.Service;
-import org.apache.turbine.util.uri.TurbineURI;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +20,10 @@ import org.apache.turbine.util.uri.Turbi
* under the License.
*/
+import org.apache.fulcrum.parser.ParameterParser;
+import org.apache.turbine.services.Service;
+import org.apache.turbine.util.uri.TurbineURI;
+
/**
* The URL mapper service provides methods to map a set of parameters to a
* simplified URL and vice-versa. This service was inspired by the
Modified: turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java?rev=1885150&r1=1885149&r2=1885150&view=diff
==============================================================================
--- turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java (original)
+++ turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java Tue Jan 5 14:56:20 2021
@@ -1,5 +1,23 @@
package org.apache.turbine.services.urlmapper.model;
+/*
+ * 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.
+ */
import java.util.LinkedHashMap;
import java.util.Map;
Modified: turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java?rev=1885150&r1=1885149&r2=1885150&view=diff
==============================================================================
--- turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java (original)
+++ turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java Tue Jan 5 14:56:20 2021
@@ -1,5 +1,24 @@
package org.apache.turbine.services.urlmapper.model;
+/*
+ * 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.
+ */
+
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
Modified: turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java?rev=1885150&r1=1885149&r2=1885150&view=diff
==============================================================================
--- turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java (original)
+++ turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java Tue Jan 5 14:56:20 2021
@@ -1,5 +1,24 @@
package org.apache.turbine.services.urlmapper.model;
+/*
+ * 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.
+ */
+
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.stream.Collectors;
Modified: turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java?rev=1885150&r1=1885149&r2=1885150&view=diff
==============================================================================
--- turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java (original)
+++ turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java Tue Jan 5 14:56:20 2021
@@ -1,5 +1,24 @@
package org.apache.turbine.services.urlmapper.model;
+/*
+ * 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.
+ */
+
import java.util.List;
/*
Modified: turbine/core/branches/URLMapperService/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/URLMapperService/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperServiceTest.java?rev=1885150&r1=1885149&r2=1885150&view=diff
==============================================================================
--- turbine/core/branches/URLMapperService/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperServiceTest.java (original)
+++ turbine/core/branches/URLMapperService/src/test/org/apache/turbine/services/urlmapper/TurbineURLMapperServiceTest.java Tue Jan 5 14:56:20 2021
@@ -1,5 +1,24 @@
package org.apache.turbine.services.urlmapper;
+/*
+ * 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.
+ */
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;