Repository: activemq-6 Updated Branches: refs/heads/master 341e49e3a -> 41376c591
added accidently removed license Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/af57d4af Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/af57d4af Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/af57d4af Branch: refs/heads/master Commit: af57d4afc9ee1b2a871743cbd2522cc5c1d95f01 Parents: 0324ece Author: Andy Taylor <[email protected]> Authored: Thu Mar 12 14:48:45 2015 +0000 Committer: Clebert Suconic <[email protected]> Committed: Thu Mar 12 11:08:11 2015 -0400 ---------------------------------------------------------------------- .../apache/activemq/utils/json/JSONArray.java | 39 ++++++++++++-------- .../activemq/utils/json/JSONException.java | 39 ++++++++++++-------- .../apache/activemq/utils/json/JSONObject.java | 39 ++++++++++++-------- .../apache/activemq/utils/json/JSONString.java | 39 ++++++++++++-------- .../apache/activemq/utils/json/JSONTokener.java | 39 ++++++++++++-------- .../src/main/resources/META-INF/LICENCE | 21 +++++++++++ pom.xml | 2 + 7 files changed, 138 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/af57d4af/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java index e4eded8..528d42c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONArray.java @@ -1,19 +1,26 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ package org.apache.activemq.utils.json; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/af57d4af/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java index 2739fb6..b9f74c9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONException.java @@ -1,19 +1,26 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ package org.apache.activemq.utils.json; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/af57d4af/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java index 7e351be..88ae5d2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONObject.java @@ -1,19 +1,26 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ package org.apache.activemq.utils.json; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/af57d4af/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java index b84d24b..407c514 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONString.java @@ -1,19 +1,26 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ package org.apache.activemq.utils.json; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/af57d4af/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java index cd6a871..f1b93b3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/utils/json/JSONTokener.java @@ -1,19 +1,26 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ package org.apache.activemq.utils.json; import java.io.BufferedReader; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/af57d4af/activemq-core-client/src/main/resources/META-INF/LICENCE ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/resources/META-INF/LICENCE b/activemq-core-client/src/main/resources/META-INF/LICENCE new file mode 100644 index 0000000..4933197 --- /dev/null +++ b/activemq-core-client/src/main/resources/META-INF/LICENCE @@ -0,0 +1,21 @@ +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/af57d4af/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 21d6569..d87952b 100644 --- a/pom.xml +++ b/pom.xml @@ -877,6 +877,7 @@ <exclude>**/filter/impl/RegExp.java</exclude> <exclude>**/utils/UUID*.java</exclude> <exclude>**/org/apache/activemq/selector/**</exclude> + <exclude>**/org/apache/activemq/utils/json/**</exclude> </excludes> <useDefaultExcludes>true</useDefaultExcludes> <strictCheck>true</strictCheck> @@ -917,6 +918,7 @@ <exclude>**/*.iml</exclude> <exclude>**/*.jceks</exclude> <exclude>**/*.jks</exclude> + <exclude>**/org/apache/activemq/utils/json/**</exclude> </excludes> </configuration> <executions>
