diff --git a/license/README b/license/README index c83455b8c4..4fd182a0ef 100644 --- a/license/README +++ b/license/README @@ -1,2 +1,3 @@ -Before Atmosphere 0.4, the CDDL license was used and hence some part of the code are CDDL. After 0.4 Atmosphere has -been relicensed using the APACHE 2 license. The majority of code has been written after 0.4. \ No newline at end of file +org.atmosphere.util.uri.* classes are under the CDDL license and comes from the Jersey Project. + +All other classes are released under the Apache 2 Licence. \ No newline at end of file diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Broadcast.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Broadcast.java index cf767a57d4..6bb069f495 100755 --- a/modules/annotations/src/main/java/org/atmosphere/annotation/Broadcast.java +++ b/modules/annotations/src/main/java/org/atmosphere/annotation/Broadcast.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.annotation; import org.atmosphere.cpr.BroadcastFilter; diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Cluster.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Cluster.java index 8d93aa7084..efd3743381 100755 --- a/modules/annotations/src/main/java/org/atmosphere/annotation/Cluster.java +++ b/modules/annotations/src/main/java/org/atmosphere/annotation/Cluster.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.annotation; diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Resume.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Resume.java index 6c66d0af75..bce5333d42 100755 --- a/modules/annotations/src/main/java/org/atmosphere/annotation/Resume.java +++ b/modules/annotations/src/main/java/org/atmosphere/annotation/Resume.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.annotation; diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Schedule.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Schedule.java index fc3e9c84a5..17ba7a5254 100755 --- a/modules/annotations/src/main/java/org/atmosphere/annotation/Schedule.java +++ b/modules/annotations/src/main/java/org/atmosphere/annotation/Schedule.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.annotation; import java.lang.annotation.ElementType; diff --git a/modules/annotations/src/main/java/org/atmosphere/annotation/Suspend.java b/modules/annotations/src/main/java/org/atmosphere/annotation/Suspend.java index 85c5ce5ff6..8b6ab9d24d 100755 --- a/modules/annotations/src/main/java/org/atmosphere/annotation/Suspend.java +++ b/modules/annotations/src/main/java/org/atmosphere/annotation/Suspend.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.annotation; diff --git a/modules/cpr/src/main/java/org/atmosphere/cache/SessionBroadcasterCache.java b/modules/cpr/src/main/java/org/atmosphere/cache/SessionBroadcasterCache.java index 5709cd392e..d0572cceca 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cache/SessionBroadcasterCache.java +++ b/modules/cpr/src/main/java/org/atmosphere/cache/SessionBroadcasterCache.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.cache; import org.atmosphere.cpr.AtmosphereResource; diff --git a/modules/cpr/src/main/java/org/atmosphere/container/BlockingIOCometSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/BlockingIOCometSupport.java index e97db7a4fd..5ce27cc0a6 100644 --- a/modules/cpr/src/main/java/org/atmosphere/container/BlockingIOCometSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/container/BlockingIOCometSupport.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.container; import org.atmosphere.cpr.Action; diff --git a/modules/cpr/src/main/java/org/atmosphere/container/GlassFishv2CometSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/GlassFishv2CometSupport.java index 1963c64cdb..5aadc32938 100644 --- a/modules/cpr/src/main/java/org/atmosphere/container/GlassFishv2CometSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/container/GlassFishv2CometSupport.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.container; import com.sun.enterprise.web.connector.grizzly.comet.CometContext; diff --git a/modules/cpr/src/main/java/org/atmosphere/container/GrizzlyCometSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/GrizzlyCometSupport.java index 32c56ba001..6f6643a7f6 100644 --- a/modules/cpr/src/main/java/org/atmosphere/container/GrizzlyCometSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/container/GrizzlyCometSupport.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.container; import com.sun.grizzly.comet.CometContext; diff --git a/modules/cpr/src/main/java/org/atmosphere/container/JBossWebCometSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/JBossWebCometSupport.java index b4af984847..cd39d82aa0 100755 --- a/modules/cpr/src/main/java/org/atmosphere/container/JBossWebCometSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/container/JBossWebCometSupport.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.container; import org.atmosphere.cpr.Action; diff --git a/modules/cpr/src/main/java/org/atmosphere/container/Jetty7CometSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/Jetty7CometSupport.java index d91d11e1af..4a823a54cf 100644 --- a/modules/cpr/src/main/java/org/atmosphere/container/Jetty7CometSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/container/Jetty7CometSupport.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.container; import org.atmosphere.cpr.Action; diff --git a/modules/cpr/src/main/java/org/atmosphere/container/JettyCometSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/JettyCometSupport.java index 81b70bc16f..31fe004155 100644 --- a/modules/cpr/src/main/java/org/atmosphere/container/JettyCometSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/container/JettyCometSupport.java @@ -12,42 +12,6 @@ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations under * the License. - *//* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * */ package org.atmosphere.container; diff --git a/modules/cpr/src/main/java/org/atmosphere/container/Servlet30CometSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/Servlet30CometSupport.java index 3662dbe967..1c8bef1c7b 100644 --- a/modules/cpr/src/main/java/org/atmosphere/container/Servlet30CometSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/container/Servlet30CometSupport.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.container; import org.atmosphere.cpr.Action; diff --git a/modules/cpr/src/main/java/org/atmosphere/container/TomcatCometSupport.java b/modules/cpr/src/main/java/org/atmosphere/container/TomcatCometSupport.java index f3ed67690b..fad9929d19 100644 --- a/modules/cpr/src/main/java/org/atmosphere/container/TomcatCometSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/container/TomcatCometSupport.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.container; import org.apache.catalina.CometEvent; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AsyncSupport.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AsyncSupport.java index 83a4f4ce9e..656b9f8ba6 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AsyncSupport.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AsyncSupport.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.cpr; import org.atmosphere.container.BlockingIOCometSupport; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AsyncSupportResolver.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AsyncSupportResolver.java index f64ad8cebf..945e4a9e08 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AsyncSupportResolver.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AsyncSupportResolver.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; /** diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java index 3ed139f731..24240e45ed 100755 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.cpr; import org.atmosphere.util.EndpointMapper; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFilter.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFilter.java index 911bd955d8..4cd272aed8 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFilter.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFilter.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; import org.atmosphere.container.BlockingIOCometSupport; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereHandler.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereHandler.java index 59b3e9ce5f..9403fdbb30 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereHandler.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereHandler.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.cpr; import java.io.IOException; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResource.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResource.java index 6370aa23d9..4578142d85 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResource.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResource.java @@ -13,44 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ - package org.atmosphere.cpr; import javax.servlet.http.HttpSession; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEvent.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEvent.java index 361bcdddb8..c457d7f617 100755 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEvent.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEvent.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; /** diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEventImpl.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEventImpl.java index 9eb1913554..e93c54b86b 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEventImpl.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEventImpl.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEventListener.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEventListener.java index 70d5ff9d53..6e5e657709 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEventListener.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceEventListener.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; /** diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java index b4d6b5e7df..4d63c8f1e8 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.cpr; import org.atmosphere.interceptor.AllowInterceptor; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServletProcessor.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServletProcessor.java index 7745e8bd1e..a2a32090a6 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServletProcessor.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServletProcessor.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.cpr; import javax.servlet.Servlet; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcastFilter.java b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcastFilter.java index 3dd5fc0145..3c9f143ed0 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcastFilter.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcastFilter.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.cpr; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcastFilterLifecycle.java b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcastFilterLifecycle.java index 5804b35df0..643771b532 100755 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcastFilterLifecycle.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcastFilterLifecycle.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.cpr; /** diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/Broadcaster.java b/modules/cpr/src/main/java/org/atmosphere/cpr/Broadcaster.java index 58b3bde231..8a1bc67a38 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/Broadcaster.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/Broadcaster.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.cpr; import java.net.URI; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterCache.java b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterCache.java index 2bf9e43bef..9c587f38f7 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterCache.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterCache.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.cpr; import org.atmosphere.cache.BroadcastMessage; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterConfig.java b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterConfig.java index 678c78c715..65558c74c3 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterConfig.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterConfig.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.cpr; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterFactory.java b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterFactory.java index 08f0d9a4e1..44b72038c8 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterFactory.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterFactory.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.cpr; import java.util.Collection; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterFuture.java b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterFuture.java index 8fad7678ee..6189614f28 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterFuture.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/BroadcasterFuture.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; import java.util.concurrent.CountDownLatch; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/ClusterBroadcastFilter.java b/modules/cpr/src/main/java/org/atmosphere/cpr/ClusterBroadcastFilter.java index 78fe7500b6..b4db7642ae 100755 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/ClusterBroadcastFilter.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/ClusterBroadcastFilter.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.cpr; /** diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultAsyncSupportResolver.java b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultAsyncSupportResolver.java index 46991cafea..f8f31a6e82 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultAsyncSupportResolver.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultAsyncSupportResolver.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java index 9f2f5542c1..caae57579c 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcaster.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; import org.atmosphere.cache.BroadcastMessage; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcasterFactory.java b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcasterFactory.java index 2ad971087b..4014f29b85 100755 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcasterFactory.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultBroadcasterFactory.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; import org.slf4j.Logger; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/Meteor.java b/modules/cpr/src/main/java/org/atmosphere/cpr/Meteor.java index 38f89d8d40..a996e668a4 100755 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/Meteor.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/Meteor.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/MeteorServlet.java b/modules/cpr/src/main/java/org/atmosphere/cpr/MeteorServlet.java index 1207b53fe5..e06a39d3b7 100644 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/MeteorServlet.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/MeteorServlet.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; import org.atmosphere.handler.ReflectorServletProcessor; diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/Serializer.java b/modules/cpr/src/main/java/org/atmosphere/cpr/Serializer.java index 2511d695ce..b7d3e4e5f0 100755 --- a/modules/cpr/src/main/java/org/atmosphere/cpr/Serializer.java +++ b/modules/cpr/src/main/java/org/atmosphere/cpr/Serializer.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.cpr; diff --git a/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java b/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java index 30b81c2560..63cb9a79ed 100644 --- a/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java +++ b/modules/cpr/src/main/java/org/atmosphere/handler/AbstractReflectorAtmosphereHandler.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.handler; diff --git a/modules/cpr/src/main/java/org/atmosphere/handler/ReflectorServletProcessor.java b/modules/cpr/src/main/java/org/atmosphere/handler/ReflectorServletProcessor.java index 56723e07f3..d656c7a880 100644 --- a/modules/cpr/src/main/java/org/atmosphere/handler/ReflectorServletProcessor.java +++ b/modules/cpr/src/main/java/org/atmosphere/handler/ReflectorServletProcessor.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.handler; import org.atmosphere.cpr.AtmosphereConfig; diff --git a/modules/cpr/src/main/java/org/atmosphere/util/AtmosphereConfigReader.java b/modules/cpr/src/main/java/org/atmosphere/util/AtmosphereConfigReader.java index e91940e08a..e20ce79856 100644 --- a/modules/cpr/src/main/java/org/atmosphere/util/AtmosphereConfigReader.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/AtmosphereConfigReader.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.util; import org.atmosphere.config.ApplicationConfiguration; diff --git a/modules/cpr/src/main/java/org/atmosphere/util/AtmosphereFilterChain.java b/modules/cpr/src/main/java/org/atmosphere/util/AtmosphereFilterChain.java index 292b872d37..de5112350d 100644 --- a/modules/cpr/src/main/java/org/atmosphere/util/AtmosphereFilterChain.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/AtmosphereFilterChain.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - * - * This file incorporates work covered by the following copyright and +/* This file incorporates work covered by the following copyright and * permission notice: * * Copyright 2004 The Apache Software Foundation diff --git a/modules/cpr/src/main/java/org/atmosphere/util/FilterConfigImpl.java b/modules/cpr/src/main/java/org/atmosphere/util/FilterConfigImpl.java index e8329b21ab..330adc2271 100644 --- a/modules/cpr/src/main/java/org/atmosphere/util/FilterConfigImpl.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/FilterConfigImpl.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - * - * This file incorporates work covered by the following copyright and +/* This file incorporates work covered by the following copyright and * permission notice: * * Copyright 2004 The Apache Software Foundation diff --git a/modules/cpr/src/main/java/org/atmosphere/util/IntrospectionUtils.java b/modules/cpr/src/main/java/org/atmosphere/util/IntrospectionUtils.java index f05a101daf..17fcf53653 100644 --- a/modules/cpr/src/main/java/org/atmosphere/util/IntrospectionUtils.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/IntrospectionUtils.java @@ -13,42 +13,8 @@ * License for the specific language governing permissions and limitations under * the License. */ + /* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - * * This file incorporates work covered by the following copyright and * permission notice: * diff --git a/modules/cpr/src/main/java/org/atmosphere/util/SimpleBroadcaster.java b/modules/cpr/src/main/java/org/atmosphere/util/SimpleBroadcaster.java index 4dca5fd506..647a01c1a3 100755 --- a/modules/cpr/src/main/java/org/atmosphere/util/SimpleBroadcaster.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/SimpleBroadcaster.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.util; import org.atmosphere.cpr.ApplicationConfig; diff --git a/modules/cpr/src/main/java/org/atmosphere/util/StringFilterAggregator.java b/modules/cpr/src/main/java/org/atmosphere/util/StringFilterAggregator.java index ca4592719e..c2a0f3fb35 100644 --- a/modules/cpr/src/main/java/org/atmosphere/util/StringFilterAggregator.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/StringFilterAggregator.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.util; import org.atmosphere.cpr.BroadcastFilter; diff --git a/modules/cpr/src/main/java/org/atmosphere/util/Version.java b/modules/cpr/src/main/java/org/atmosphere/util/Version.java index a0e3ca6b8e..c7f8de8fc5 100644 --- a/modules/cpr/src/main/java/org/atmosphere/util/Version.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/Version.java @@ -13,44 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ - package org.atmosphere.util; import java.io.IOException; diff --git a/modules/cpr/src/main/java/org/atmosphere/util/WebDotXmlReader.java b/modules/cpr/src/main/java/org/atmosphere/util/WebDotXmlReader.java index c86c9778a1..40c90456b8 100644 --- a/modules/cpr/src/main/java/org/atmosphere/util/WebDotXmlReader.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/WebDotXmlReader.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.util; import org.atmosphere.cpr.FrameworkConfig; diff --git a/modules/cpr/src/main/java/org/atmosphere/util/XSSHtmlFilter.java b/modules/cpr/src/main/java/org/atmosphere/util/XSSHtmlFilter.java index 65292715e8..6f31cd0de1 100644 --- a/modules/cpr/src/main/java/org/atmosphere/util/XSSHtmlFilter.java +++ b/modules/cpr/src/main/java/org/atmosphere/util/XSSHtmlFilter.java @@ -13,42 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ + package org.atmosphere.util; import org.atmosphere.cpr.BroadcastFilter; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereFilter.java b/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereFilter.java index ddf4a86ebf..b7c8c35093 100755 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereFilter.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereFilter.java @@ -13,42 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -* -* Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. -* -* The contents of this file are subject to the terms of either the GNU -* General Public License Version 2 only ("GPL") or the Common Development -* and Distribution License("CDDL") (collectively, the "License"). You -* may not use this file except in compliance with the License. You can obtain -* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html -* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific -* language governing permissions and limitations under the License. -* -* When distributing the software, include this License Header Notice in each -* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. -* Sun designates this particular file as subject to the "Classpath" exception -* as provided by Sun in the GPL Version 2 section of the License file that -* accompanied this code. If applicable, add the following below the License -* Header, with the fields enclosed by brackets [] replaced by your own -* identifying information: "Portions Copyrighted [year] -* [name of copyright owner]" -* -* Contributor(s): -* -* If you wish your version of this file to be governed by only the CDDL or -* only the GPL Version 2, indicate your decision by adding "[Contributor] -* elects to include this software in this distribution under the [CDDL or GPL -* Version 2] license." If you don't indicate a single choice of license, a -* recipient has the option to distribute your version of this file under -* either the CDDL, the GPL Version 2 or to extend the choice of license to -* its licensees as provided above. However, if you add GPL Version 2 code -* and therefore, elected the GPL Version 2 license, then the option applies -* only if the new code is made subject to such option by the copyright -* holder. -*/ package org.atmosphere.jersey; import com.sun.jersey.api.JResponseAsResponse; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereProviders.java b/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereProviders.java index 724e3d3090..91d9048173 100644 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereProviders.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereProviders.java @@ -13,42 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://jersey.dev.java.net/CDDL+GPL.html - * or jersey/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at jersey/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ package org.atmosphere.jersey; import com.sun.jersey.spi.StringReader; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereResourceConfigurator.java b/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereResourceConfigurator.java index d842dc6d48..9a75647a00 100755 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereResourceConfigurator.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereResourceConfigurator.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -* -* Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. -* -* The contents of this file are subject to the terms of either the GNU -* General Public License Version 2 only ("GPL") or the Common Development -* and Distribution License("CDDL") (collectively, the "License"). You -* may not use this file except in compliance with the License. You can obtain -* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html -* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific -* language governing permissions and limitations under the License. -* -* When distributing the software, include this License Header Notice in each -* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. -* Sun designates this particular file as subject to the "Classpath" exception -* as provided by Sun in the GPL Version 2 section of the License file that -* accompanied this code. If applicable, add the following below the License -* Header, with the fields enclosed by brackets [] replaced by your own -* identifying information: "Portions Copyrighted [year] -* [name of copyright owner]" -* -* Contributor(s): -* -* If you wish your version of this file to be governed by only the CDDL or -* only the GPL Version 2, indicate your decision by adding "[Contributor] -* elects to include this software in this distribution under the [CDDL or GPL -* Version 2] license." If you don't indicate a single choice of license, a -* recipient has the option to distribute your version of this file under -* either the CDDL, the GPL Version 2 or to extend the choice of license to -* its licensees as provided above. However, if you add GPL Version 2 code -* and therefore, elected the GPL Version 2 license, then the option applies -* only if the new code is made subject to such option by the copyright -* holder. -*/ - package org.atmosphere.jersey; import com.sun.jersey.api.core.ResourceConfig; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereResourceInjector.java b/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereResourceInjector.java index a58674040e..72408759a6 100644 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereResourceInjector.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereResourceInjector.java @@ -13,42 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -* -* Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. -* -* The contents of this file are subject to the terms of either the GNU -* General Public License Version 2 only ("GPL") or the Common Development -* and Distribution License("CDDL") (collectively, the "License"). You -* may not use this file except in compliance with the License. You can obtain -* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html -* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific -* language governing permissions and limitations under the License. -* -* When distributing the software, include this License Header Notice in each -* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. -* Sun designates this particular file as subject to the "Classpath" exception -* as provided by Sun in the GPL Version 2 section of the License file that -* accompanied this code. If applicable, add the following below the License -* Header, with the fields enclosed by brackets [] replaced by your own -* identifying information: "Portions Copyrighted [year] -* [name of copyright owner]" -* -* Contributor(s): -* -* If you wish your version of this file to be governed by only the CDDL or -* only the GPL Version 2, indicate your decision by adding "[Contributor] -* elects to include this software in this distribution under the [CDDL or GPL -* Version 2] license." If you don't indicate a single choice of license, a -* recipient has the option to distribute your version of this file under -* either the CDDL, the GPL Version 2 or to extend the choice of license to -* its licensees as provided above. However, if you add GPL Version 2 code -* and therefore, elected the GPL Version 2 license, then the option applies -* only if the new code is made subject to such option by the copyright -* holder. -*/ package org.atmosphere.jersey; import com.sun.jersey.core.spi.component.ComponentContext; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/BaseInjectableProvider.java b/modules/jersey/src/main/java/org/atmosphere/jersey/BaseInjectableProvider.java index d7f879bf94..805095f5c6 100644 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/BaseInjectableProvider.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/BaseInjectableProvider.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -* -* Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. -* -* The contents of this file are subject to the terms of either the GNU -* General Public License Version 2 only ("GPL") or the Common Development -* and Distribution License("CDDL") (collectively, the "License"). You -* may not use this file except in compliance with the License. You can obtain -* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html -* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific -* language governing permissions and limitations under the License. -* -* When distributing the software, include this License Header Notice in each -* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. -* Sun designates this particular file as subject to the "Classpath" exception -* as provided by Sun in the GPL Version 2 section of the License file that -* accompanied this code. If applicable, add the following below the License -* Header, with the fields enclosed by brackets [] replaced by your own -* identifying information: "Portions Copyrighted [year] -* [name of copyright owner]" -* -* Contributor(s): -* -* If you wish your version of this file to be governed by only the CDDL or -* only the GPL Version 2, indicate your decision by adding "[Contributor] -* elects to include this software in this distribution under the [CDDL or GPL -* Version 2] license." If you don't indicate a single choice of license, a -* recipient has the option to distribute your version of this file under -* either the CDDL, the GPL Version 2 or to extend the choice of license to -* its licensees as provided above. However, if you add GPL Version 2 code -* and therefore, elected the GPL Version 2 license, then the option applies -* only if the new code is made subject to such option by the copyright -* holder. -*/ - package org.atmosphere.jersey; import com.sun.jersey.spi.inject.InjectableProvider; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/Broadcastable.java b/modules/jersey/src/main/java/org/atmosphere/jersey/Broadcastable.java index 317174b47f..14a72567d7 100644 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/Broadcastable.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/Broadcastable.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ - package org.atmosphere.jersey; import org.atmosphere.cpr.AtmosphereResource; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/BroadcasterFactoryInjector.java b/modules/jersey/src/main/java/org/atmosphere/jersey/BroadcasterFactoryInjector.java index f18fbe8099..ea088b27dc 100644 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/BroadcasterFactoryInjector.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/BroadcasterFactoryInjector.java @@ -13,42 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -* -* Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. -* -* The contents of this file are subject to the terms of either the GNU -* General Public License Version 2 only ("GPL") or the Common Development -* and Distribution License("CDDL") (collectively, the "License"). You -* may not use this file except in compliance with the License. You can obtain -* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html -* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific -* language governing permissions and limitations under the License. -* -* When distributing the software, include this License Header Notice in each -* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. -* Sun designates this particular file as subject to the "Classpath" exception -* as provided by Sun in the GPL Version 2 section of the License file that -* accompanied this code. If applicable, add the following below the License -* Header, with the fields enclosed by brackets [] replaced by your own -* identifying information: "Portions Copyrighted [year] -* [name of copyright owner]" -* -* Contributor(s): -* -* If you wish your version of this file to be governed by only the CDDL or -* only the GPL Version 2, indicate your decision by adding "[Contributor] -* elects to include this software in this distribution under the [CDDL or GPL -* Version 2] license." If you don't indicate a single choice of license, a -* recipient has the option to distribute your version of this file under -* either the CDDL, the GPL Version 2 or to extend the choice of license to -* its licensees as provided above. However, if you add GPL Version 2 code -* and therefore, elected the GPL Version 2 license, then the option applies -* only if the new code is made subject to such option by the copyright -* holder. -*/ package org.atmosphere.jersey; import com.sun.jersey.core.spi.component.ComponentContext; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/BroadcasterInjector.java b/modules/jersey/src/main/java/org/atmosphere/jersey/BroadcasterInjector.java index a72bd140c9..2d25e3efe1 100644 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/BroadcasterInjector.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/BroadcasterInjector.java @@ -13,42 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -* -* Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. -* -* The contents of this file are subject to the terms of either the GNU -* General Public License Version 2 only ("GPL") or the Common Development -* and Distribution License("CDDL") (collectively, the "License"). You -* may not use this file except in compliance with the License. You can obtain -* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html -* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific -* language governing permissions and limitations under the License. -* -* When distributing the software, include this License Header Notice in each -* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. -* Sun designates this particular file as subject to the "Classpath" exception -* as provided by Sun in the GPL Version 2 section of the License file that -* accompanied this code. If applicable, add the following below the License -* Header, with the fields enclosed by brackets [] replaced by your own -* identifying information: "Portions Copyrighted [year] -* [name of copyright owner]" -* -* Contributor(s): -* -* If you wish your version of this file to be governed by only the CDDL or -* only the GPL Version 2, indicate your decision by adding "[Contributor] -* elects to include this software in this distribution under the [CDDL or GPL -* Version 2] license." If you don't indicate a single choice of license, a -* recipient has the option to distribute your version of this file under -* either the CDDL, the GPL Version 2 or to extend the choice of license to -* its licensees as provided above. However, if you add GPL Version 2 code -* and therefore, elected the GPL Version 2 license, then the option applies -* only if the new code is made subject to such option by the copyright -* holder. -*/ package org.atmosphere.jersey; import com.sun.jersey.core.spi.component.ComponentContext; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/JerseyBroadcaster.java b/modules/jersey/src/main/java/org/atmosphere/jersey/JerseyBroadcaster.java index 4f7d11e458..ecd9159291 100644 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/JerseyBroadcaster.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/JerseyBroadcaster.java @@ -13,43 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ + package org.atmosphere.jersey; import com.sun.jersey.spi.container.ContainerResponse; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/SuspendResponse.java b/modules/jersey/src/main/java/org/atmosphere/jersey/SuspendResponse.java index bfcd4ad28a..0326495cc3 100644 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/SuspendResponse.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/SuspendResponse.java @@ -13,22 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * Copyright 2014 Jeanfrancois Arcand - * - * Licensed 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.atmosphere.jersey; import com.sun.jersey.api.JResponse; diff --git a/modules/jersey/src/main/java/org/atmosphere/jersey/util/JerseySimpleBroadcaster.java b/modules/jersey/src/main/java/org/atmosphere/jersey/util/JerseySimpleBroadcaster.java index 3eafa8c110..0dbb22f584 100755 --- a/modules/jersey/src/main/java/org/atmosphere/jersey/util/JerseySimpleBroadcaster.java +++ b/modules/jersey/src/main/java/org/atmosphere/jersey/util/JerseySimpleBroadcaster.java @@ -13,43 +13,6 @@ * License for the specific language governing permissions and limitations under * the License. */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2007-2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ package org.atmosphere.jersey.util; diff --git a/modules/native/pom.xml b/modules/native/pom.xml index e38d2f4a6a..f8d948ba4d 100644 --- a/modules/native/pom.xml +++ b/modules/native/pom.xml @@ -56,7 +56,6 @@ org/atmosphere/cpr/AtmosphereServlet.java - org/atmosphere/container/JSR356ServerApplicationConfig.java diff --git a/modules/native/src/main/java/org/atmosphere/container/JSR356ServerApplicationConfig.java b/modules/native/src/main/java/org/atmosphere/container/JSR356ServerApplicationConfig.java deleted file mode 100644 index 2a104c82d5..0000000000 --- a/modules/native/src/main/java/org/atmosphere/container/JSR356ServerApplicationConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2014 Jeanfrancois Arcand - * - * Licensed 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.atmosphere.container; - -/** - * JSR356 implementation. - */ -public class JSR356ServerApplicationConfig { - -}