Repository: deltaspike Updated Branches: refs/heads/master 0b2c39eb5 -> 9cb3fe2e4
DELTASPIKE-653 Copyright headers. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9cb3fe2e Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9cb3fe2e Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9cb3fe2e Branch: refs/heads/master Commit: 9cb3fe2e4e9acf944fe6d85de203047eb5970273 Parents: 0b2c39e Author: John D. Ament <johndam...@apache.org> Authored: Tue Aug 5 22:42:26 2014 -0400 Committer: John D. Ament <johndam...@apache.org> Committed: Tue Aug 5 22:42:26 2014 -0400 ---------------------------------------------------------------------- deltaspike/cdictrl/servlet-test-jetty/pom.xml | 20 +++++++++++-- .../cdise/servlet/test/jetty/JettyTest.java | 22 +++++++++++--- .../src/test/resources/META-INF/beans.xml | 21 ++++++++++++-- .../cdictrl/servlet-test-undertow/pom.xml | 20 +++++++++++-- .../cdise/servlet/test/ut/UndertowTest.java | 22 +++++++++++--- .../src/test/resources/META-INF/beans.xml | 21 ++++++++++++-- deltaspike/cdictrl/servlet/pom.xml | 20 +++++++++++-- .../servlet/test/EmbeddedServletContainer.java | 30 ++++++++++++-------- .../servlet/test/content/RequestScopedBean.java | 22 +++++++++++--- .../servlet/test/content/RequestServlet.java | 22 +++++++++++--- 10 files changed, 177 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet-test-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet-test-jetty/pom.xml b/deltaspike/cdictrl/servlet-test-jetty/pom.xml index 547f2e1..6582602 100644 --- a/deltaspike/cdictrl/servlet-test-jetty/pom.xml +++ b/deltaspike/cdictrl/servlet-test-jetty/pom.xml @@ -1,8 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> - <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java b/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java index a6947e4..3a16a52 100644 --- a/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java +++ b/deltaspike/cdictrl/servlet-test-jetty/src/test/java/org/apache/deltaspike/cdise/servlet/test/jetty/JettyTest.java @@ -1,7 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ******************************************************************************/ - +/* + * 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.deltaspike.cdise.servlet.test.jetty; import org.apache.deltaspike.cdise.servlet.CdiServletRequestListener; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml b/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml index 3ac4b3b..4070730 100644 --- a/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml +++ b/deltaspike/cdictrl/servlet-test-jetty/src/test/resources/META-INF/beans.xml @@ -1,7 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!-- + 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. +--> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet-test-undertow/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet-test-undertow/pom.xml b/deltaspike/cdictrl/servlet-test-undertow/pom.xml index fd341d0..a24f68f 100644 --- a/deltaspike/cdictrl/servlet-test-undertow/pom.xml +++ b/deltaspike/cdictrl/servlet-test-undertow/pom.xml @@ -1,8 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> - <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java b/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java index 5e1fd15..2ddf38c 100644 --- a/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java +++ b/deltaspike/cdictrl/servlet-test-undertow/src/test/java/org/apache/deltaspike/cdise/servlet/test/ut/UndertowTest.java @@ -1,7 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ******************************************************************************/ - +/* + * 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.deltaspike.cdise.servlet.test.ut; import io.undertow.Undertow; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml b/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml index 3ac4b3b..4070730 100644 --- a/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml +++ b/deltaspike/cdictrl/servlet-test-undertow/src/test/resources/META-INF/beans.xml @@ -1,7 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!-- + 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. +--> <beans xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd";> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet/pom.xml b/deltaspike/cdictrl/servlet/pom.xml index d920eed..643eaa4 100644 --- a/deltaspike/cdictrl/servlet/pom.xml +++ b/deltaspike/cdictrl/servlet/pom.xml @@ -1,8 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> - <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java index a156c1a..09464f3 100644 --- a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java +++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java @@ -1,19 +1,25 @@ -/******************************************************************************* - * Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ******************************************************************************/ - +/* + * 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.deltaspike.cdise.servlet.test; -import io.undertow.Undertow; -import io.undertow.servlet.Servlets; -import io.undertow.servlet.api.DeploymentInfo; -import io.undertow.servlet.api.DeploymentManager; -import io.undertow.servlet.api.ListenerInfo; -import io.undertow.servlet.api.ServletInfo; import org.apache.deltaspike.cdise.api.CdiContainer; import org.apache.deltaspike.cdise.api.CdiContainerLoader; -import org.apache.deltaspike.cdise.servlet.CdiServletRequestListener; -import org.apache.deltaspike.cdise.servlet.test.content.RequestServlet; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java index 1f855ad..41958bc 100644 --- a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java +++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestScopedBean.java @@ -1,7 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ******************************************************************************/ - +/* + * 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.deltaspike.cdise.servlet.test.content; import javax.enterprise.context.RequestScoped; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9cb3fe2e/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java index 85100ae..6fa1d98 100644 --- a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java +++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/content/RequestServlet.java @@ -1,7 +1,21 @@ -/******************************************************************************* - * Copyright (c) 2013 - 2014 Sparta Systems, Inc. - ******************************************************************************/ - +/* + * 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.deltaspike.cdise.servlet.test.content; import org.apache.deltaspike.cdise.api.CdiContainerLoader;
