You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/11/13 06:09:52 UTC
[25/43] incubator-streams git commit: STREAMS-210 | Fixing commit
issue
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/streams-runtimes/src/main/resources/META-INF/LICENSE b/streams-runtimes/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/streams-runtimes/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/streams-runtimes/src/main/resources/META-INF/NOTICE b/streams-runtimes/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index efe3734..0000000
--- a/streams-runtimes/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-
-streams-runtimes
-Copyright 2012-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsMergeTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsMergeTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsMergeTask.java
index 8280f29..7a4c806 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsMergeTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsMergeTask.java
@@ -19,8 +19,6 @@
package org.apache.streams.local.tasks;
import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.local.counters.StreamsTaskCounter;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -80,9 +78,4 @@ public class StreamsMergeTask extends BaseStreamsTask {
}
}
}
-
- @Override
- public void setStreamsTaskCounter(StreamsTaskCounter counter) {
- throw new NotImplementedException();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java
index 003ab9e..cab46b8 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsPersistWriterTask.java
@@ -20,11 +20,13 @@ package org.apache.streams.local.tasks;
import org.apache.streams.core.*;
import org.apache.streams.core.util.DatumUtils;
-import org.apache.streams.local.counters.StreamsTaskCounter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -43,7 +45,6 @@ public class StreamsPersistWriterTask extends BaseStreamsTask implements DatumSt
private BlockingQueue<StreamsDatum> inQueue;
private AtomicBoolean isRunning;
private AtomicBoolean blocked;
- private StreamsTaskCounter counter;
private DatumStatusCounter statusCounter = new DatumStatusCounter();
@@ -98,9 +99,6 @@ public class StreamsPersistWriterTask extends BaseStreamsTask implements DatumSt
public void run() {
try {
this.writer.prepare(this.streamConfig);
- if(this.counter == null) {
- this.counter = new StreamsTaskCounter(this.writer.getClass().getName()+ UUID.randomUUID().toString());
- }
while(this.keepRunning.get()) {
StreamsDatum datum = null;
try {
@@ -113,18 +111,14 @@ public class StreamsPersistWriterTask extends BaseStreamsTask implements DatumSt
Thread.currentThread().interrupt();
}
if(datum != null) {
- this.counter.incrementReceivedCount();
try {
- long startTime = System.currentTimeMillis();
this.writer.write(datum);
- this.counter.addTime(System.currentTimeMillis() - startTime);
statusCounter.incrementStatus(DatumStatus.SUCCESS);
} catch (Exception e) {
LOGGER.error("Error writing to persist writer {}", this.writer.getClass().getSimpleName(), e);
this.keepRunning.set(false); // why do we shutdown on a failed write ?
statusCounter.incrementStatus(DatumStatus.FAIL);
DatumUtils.addErrorToMetadata(datum, e, this.writer.getClass());
- this.counter.incrementErrorCount();
}
} else { //datums should never be null
LOGGER.debug("Received null StreamsDatum @ writer : {}", this.writer.getClass().getName());
@@ -157,8 +151,4 @@ public class StreamsPersistWriterTask extends BaseStreamsTask implements DatumSt
return queues;
}
- @Override
- public void setStreamsTaskCounter(StreamsTaskCounter counter) {
- this.counter = counter;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
index b6ab498..1bb565d 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
@@ -21,11 +21,13 @@ package org.apache.streams.local.tasks;
import com.google.common.collect.Maps;
import org.apache.streams.core.*;
import org.apache.streams.core.util.DatumUtils;
-import org.apache.streams.local.counters.StreamsTaskCounter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,7 +47,6 @@ public class StreamsProcessorTask extends BaseStreamsTask implements DatumStatus
private BlockingQueue<StreamsDatum> inQueue;
private AtomicBoolean isRunning;
private AtomicBoolean blocked;
- private StreamsTaskCounter counter;
private DatumStatusCounter statusCounter = new DatumStatusCounter();
@@ -104,9 +105,6 @@ public class StreamsProcessorTask extends BaseStreamsTask implements DatumStatus
public void run() {
try {
this.processor.prepare(this.streamConfig);
- if(this.counter == null) {
- this.counter = new StreamsTaskCounter(this.processor.getClass().getName()+ UUID.randomUUID().toString());
- }
while(this.keepRunning.get()) {
StreamsDatum datum = null;
try {
@@ -119,15 +117,11 @@ public class StreamsProcessorTask extends BaseStreamsTask implements DatumStatus
Thread.currentThread().interrupt();
}
if(datum != null) {
- this.counter.incrementReceivedCount();
try {
- long startTime = System.currentTimeMillis();
List<StreamsDatum> output = this.processor.process(datum);
- this.counter.addTime(System.currentTimeMillis() - startTime);
if(output != null) {
for(StreamsDatum outDatum : output) {
super.addToOutgoingQueue(outDatum);
- this.counter.incrementEmittedCount();
statusCounter.incrementStatus(DatumStatus.SUCCESS);
}
}
@@ -136,7 +130,6 @@ public class StreamsProcessorTask extends BaseStreamsTask implements DatumStatus
this.keepRunning.set(false);
Thread.currentThread().interrupt();
} catch (Throwable t) {
- this.counter.incrementErrorCount();
LOGGER.warn("Caught Throwable in processor, {} : {}", this.processor.getClass().getName(), t.getMessage());
statusCounter.incrementStatus(DatumStatus.FAIL);
//Add the error to the metadata, but keep processing
@@ -158,9 +151,4 @@ public class StreamsProcessorTask extends BaseStreamsTask implements DatumStatus
queues.add(this.inQueue);
return queues;
}
-
- @Override
- public void setStreamsTaskCounter(StreamsTaskCounter counter) {
- this.counter = counter;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
index 2475780..c16f64d 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProviderTask.java
@@ -20,7 +20,6 @@ package org.apache.streams.local.tasks;
import org.apache.streams.core.*;
import org.apache.streams.core.util.DatumUtils;
-import org.apache.streams.local.counters.StreamsTaskCounter;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,7 +27,6 @@ import org.slf4j.LoggerFactory;
import java.math.BigInteger;
import java.util.Map;
import java.util.Queue;
-import java.util.UUID;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -66,7 +64,6 @@ public class StreamsProviderTask extends BaseStreamsTask implements DatumStatusC
private long sleepTime;
private int zeros = 0;
private DatumStatusCounter statusCounter = new DatumStatusCounter();
- private StreamsTaskCounter counter;
/**
* Constructor for a StreamsProvider to execute {@link org.apache.streams.core.StreamsProvider:readCurrent()}
@@ -148,18 +145,13 @@ public class StreamsProviderTask extends BaseStreamsTask implements DatumStatusC
StreamsResultSet resultSet = null;
//Negative values mean we want to run forever
long maxZeros = timeout < 0 ? Long.MAX_VALUE : (timeout / sleepTime);
- if(this.counter == null) { //should never be null
- this.counter = new StreamsTaskCounter(this.provider.getClass().getName()+ UUID.randomUUID().toString());
- }
switch(this.type) {
case PERPETUAL: {
provider.startStream();
this.started.set(true);
while(this.isRunning()) {
try {
- long startTime = System.currentTimeMillis();
resultSet = provider.readCurrent();
- this.counter.addTime(System.currentTimeMillis() - startTime);
if( resultSet.size() == 0 )
zeros++;
else {
@@ -172,7 +164,6 @@ public class StreamsProviderTask extends BaseStreamsTask implements DatumStatusC
if(zeros > 0)
Thread.sleep(sleepTime);
} catch (InterruptedException e) {
- this.counter.incrementErrorCount();
LOGGER.warn("Thread interrupted");
this.keepRunning.set(false);
}
@@ -228,10 +219,8 @@ public class StreamsProviderTask extends BaseStreamsTask implements DatumStatusC
if(datum != null) {
try {
super.addToOutgoingQueue(datum);
- this.counter.incrementEmittedCount();
statusCounter.incrementStatus(DatumStatus.SUCCESS);
} catch( Exception e ) {
- this.counter.incrementErrorCount();
statusCounter.incrementStatus(DatumStatus.FAIL);
DatumUtils.addErrorToMetadata(datum, e, this.provider.getClass());
}
@@ -240,8 +229,4 @@ public class StreamsProviderTask extends BaseStreamsTask implements DatumStatusC
this.flushing.set(false);
}
- @Override
- public void setStreamsTaskCounter(StreamsTaskCounter counter) {
- this.counter = counter;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsTask.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsTask.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsTask.java
index 8423095..7513631 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsTask.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsTask.java
@@ -19,7 +19,6 @@
package org.apache.streams.local.tasks;
import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.local.counters.StreamsTaskCounter;
import java.util.List;
import java.util.Map;
@@ -88,7 +87,4 @@ public interface StreamsTask extends Runnable{
*/
public List<BlockingQueue<StreamsDatum>> getOutputQueues();
-
- public void setStreamsTaskCounter(StreamsTaskCounter counter);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/DEPENDENCIES b/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/DEPENDENCIES
deleted file mode 100644
index bc78eca..0000000
--- a/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/DEPENDENCIES
+++ /dev/null
@@ -1,117 +0,0 @@
-// ------------------------------------------------------------------
-// Transitive dependencies of this project determined from the
-// maven pom organized by organization.
-// ------------------------------------------------------------------
-
-streams-runtime-local
-
-
-From: 'an unknown organization'
- - FindBugs-Annotations (http://findbugs.sourceforge.net/) com.google.code.findbugs:annotations:jar:1.3.9
- License: GNU Lesser Public License (http://www.gnu.org/licenses/lgpl.html)
- - Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:bundle:17.0
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Bean Validation API javax.validation:validation-api:jar:1.0.0.GA
- License: Apache License, Version 2.0 (license.txt)
- - jsr173_api javax.xml.bind:jsr173_api:jar:1.0
-
- - stax-api javax.xml.stream:stax-api:jar:1.0-2
-
- - JAXB Utilities (http://www.ultraq.net.nz/programming/jaxb-utilities/) nz.net.ultraq.jaxb:jaxb-utilities:jar:1.2.6
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - JSON in Java (https://github.com/douglascrockford/JSON-java) org.json:json:jar:20140107
- License: The JSON License (http://json.org/license.html)
- - jsonschema2pojo-core (https://github.com/joelittlejohn/jsonschema2pojo/jsonschema2pojo-core) org.jsonschema2pojo:jsonschema2pojo-core:jar:0.4.5
- License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-
-From: 'Carrot Search s.c.' (http://carrotsearch.com)
- - RandomizedTesting Randomized Runner (http://labs.carrotsearch.com/randomizedtesting-runner) com.carrotsearch.randomizedtesting:randomizedtesting-runner:jar:2.1.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-From: 'Codehaus' (http://www.codehaus.org/)
- - Stax2 API (http://woodstox.codehaus.org/StAX2) org.codehaus.woodstox:stax2-api:jar:3.1.1
- License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
-
-From: 'FasterXML' (http://fasterxml.com)
- - Jackson (http://jackson.codehaus.org) org.codehaus.jackson:jackson-core-asl:jar:1.9.11
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Data Mapper for Jackson (http://jackson.codehaus.org) org.codehaus.jackson:jackson-mapper-asl:jar:1.9.11
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Xml Compatibility extensions for Jackson (http://jackson.codehaus.org) org.codehaus.jackson:jackson-xc:jar:1.9.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License (LGPL), Version 2.1 (http://www.fsf.org/licensing/licenses/lgpl.txt)
-
-From: 'FasterXML' (http://fasterxml.com/)
- - aalto-xml (http://github.com/FasterXML/aalto-xml/) com.fasterxml:aalto-xml:jar:0.9.9
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Jackson-annotations (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-annotations:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-core (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-core:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - jackson-databind (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-databind:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-dataformat-XML (http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) com.fasterxml.jackson.dataformat:jackson-dataformat-xml:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-datatype-Joda (http://wiki.fasterxml.com/JacksonModuleJoda) com.fasterxml.jackson.datatype:jackson-datatype-joda:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-datatype-json.org (http://wiki.fasterxml.com/JacksonModuleProjects) com.fasterxml.jackson.datatype:jackson-datatype-json-org:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-module-JAXB-annotations (http://wiki.fasterxml.com/JacksonJAXBAnnotations) com.fasterxml.jackson.module:jackson-module-jaxb-annotations:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
-
-From: 'fasterxml.com' (http://fasterxml.com)
- - Jackson-XML-databind (http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) com.fasterxml:jackson-xml-databind:bundle:0.6.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-From: 'Google, Inc.' (http://www.google.com)
- - Gson (http://code.google.com/p/google-gson/) com.google.code.gson:gson:jar:2.2.4
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-From: 'Joda.org' (http://www.joda.org)
- - Joda time (http://joda-time.sourceforge.net) joda-time:joda-time:jar:2.2
- License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-From: 'Oracle' (http://www.oracle.com/)
- - Codemodel Core (http://codemodel.java.net/codemodel/) com.sun.codemodel:codemodel:jar:2.6
- License: CDDL v1.1 / GPL v2 dual license (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
-
-From: 'Oracle Corporation' (http://www.oracle.com/)
- - istack common utility code runtime (http://java.net/istack-commons/istack-commons-runtime/) com.sun.istack:istack-commons-runtime:jar:2.16
- License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) License: GPL2 w/ CPE (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
- - JAXB CORE (http://jaxb.java.net/) com.sun.xml.bind:jaxb-core:jar:2.2.7
- License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) License: GPL2 w/ CPE (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
- - JAXB Reference Implementation (http://jaxb.java.net/) com.sun.xml.bind:jaxb-impl:jar:2.2.7
- License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) License: GPL2 w/ CPE (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
- - Java Architecture for XML Binding (http://jaxb.java.net/) javax.xml.bind:jaxb-api:jar:2.2.7
- License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) License: GPL2 w/ CPE (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
-
-From: 'Oracle Corpration' (http://www.oracle.com)
- - fastinfoset (http://fi.java.net) com.sun.xml.fastinfoset:FastInfoset:jar:1.2.12
- License: Apache License, Version 2.0 (http://www.opensource.org/licenses/apache2.0.php)
-
-From: 'QOS.ch' (http://www.qos.ch)
- - Logback Classic Module (http://logback.qos.ch) ch.qos.logback:logback-classic:jar:1.1.1
- License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - Logback Core Module (http://logback.qos.ch) ch.qos.logback:logback-core:jar:1.1.1
- License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - Log4j Implemented Over SLF4J (http://www.slf4j.org) org.slf4j:log4j-over-slf4j:jar:1.7.6
- License: Apache Software Licenses (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.6
- License: MIT License (http://www.opensource.org/licenses/mit-license.php)
-
-From: 'The Apache Software Foundation' (http://www.apache.org/)
- - Commons IO (http://commons.apache.org/io/) commons-io:commons-io:jar:2.4
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Commons Lang (http://commons.apache.org/lang/) commons-lang:commons-lang:jar:2.6
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Commons Lang (http://commons.apache.org/lang/) org.apache.commons:commons-lang3:jar:3.1
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - streams-core (http://incubator.apache.org/streams/streams-project/streams-core) org.apache.streams:streams-core:jar:0.1-SNAPSHOT
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - streams-pojo (http://incubator.apache.org/streams/streams-project/streams-pojo) org.apache.streams:streams-pojo:jar:0.1-SNAPSHOT
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - streams-util (http://incubator.apache.org/streams/streams-project/streams-util) org.apache.streams:streams-util:jar:0.1-SNAPSHOT
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/DISCLAIMER
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/DISCLAIMER b/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/DISCLAIMER
deleted file mode 100644
index 028c2b4..0000000
--- a/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/DISCLAIMER
+++ /dev/null
@@ -1,10 +0,0 @@
-streams-runtime-local is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/LICENSE b/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/NOTICE b/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index dba5822..0000000
--- a/streams-runtimes/streams-runtime-local/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-
-streams-runtime-local
-Copyright 2012-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
index a675d87..6513032 100644
--- a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
+++ b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
@@ -43,7 +43,6 @@ import org.apache.streams.core.StreamBuilder;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsPersistWriter;
import org.apache.streams.core.StreamsProcessor;
-import org.apache.streams.local.counters.StreamsTaskCounter;
import org.apache.streams.local.queues.ThroughputQueue;
import org.apache.streams.local.test.processors.PassthroughDatumCounterProcessor;
import org.apache.streams.local.test.processors.SlowProcessor;
@@ -94,17 +93,10 @@ public class LocalStreamBuilderTest extends RandomizedTest {
} catch (MalformedObjectNameException|InstanceNotFoundException|MBeanRegistrationException e) {
//No-op
}
- try {
- mbs.unregisterMBean(new ObjectName((String.format(StreamsTaskCounter.NAME_TEMPLATE, id))));
- } catch (MalformedObjectNameException|InstanceNotFoundException|MBeanRegistrationException e) {
- //No-op
- }
}
}
-
-
@Test
public void testStreamIdValidations() {
StreamBuilder builder = new LocalStreamBuilder();
@@ -124,7 +116,7 @@ public class LocalStreamBuilderTest extends RandomizedTest {
exp = e;
}
assertNotNull(exp);
- removeRegisteredMBeans("1", "2", "id");
+ removeRegisteredMBeans("1", "2");
}
@Test
@@ -180,9 +172,9 @@ public class LocalStreamBuilderTest extends RandomizedTest {
}
} finally {
for(int i=0; i < numProcessors; ++i) {
- removeRegisteredMBeans(processorId+i, processorId+i+"-"+PassthroughDatumCounterProcessor.class.getCanonicalName());
+ removeRegisteredMBeans(processorId+i);
}
- removeRegisteredMBeans("writer", "numeric_provider");
+ removeRegisteredMBeans("writer");
}
}
@@ -219,7 +211,7 @@ public class LocalStreamBuilderTest extends RandomizedTest {
for(int i=0; i < numProcessors; ++i) {
removeRegisteredMBeans(processorId+i);
}
- removeRegisteredMBeans("writer", "numeric_provider");
+ removeRegisteredMBeans("writer");
}
}
@@ -241,9 +233,7 @@ public class LocalStreamBuilderTest extends RandomizedTest {
assertEquals(numDatums2, PassthroughDatumCounterProcessor.COUNTS.get("proc2").get());
assertEquals(numDatums1+numDatums2, DatumCounterWriter.COUNTS.get("writer").get());
} finally {
- String procClass = "-"+PassthroughDatumCounterProcessor.class.getCanonicalName();
- String writerClass = "-"+DatumCounterWriter.class.getCanonicalName();
- removeRegisteredMBeans("proc1", "proc2", "writer1", "sp1", "sp2");
+ removeRegisteredMBeans("proc1", "proc2", "writer1");
}
}
@@ -261,9 +251,6 @@ public class LocalStreamBuilderTest extends RandomizedTest {
assertEquals(numDatums, PassthroughDatumCounterProcessor.COUNTS.get("proc2").get());
assertEquals(numDatums*2, DatumCounterWriter.COUNTS.get("writer").get());
} finally {
- String provClass = "-"+NumericMessageProvider.class.getCanonicalName();
- String procClass = "-"+PassthroughDatumCounterProcessor.class.getCanonicalName();
- String writerClass = "-"+DatumCounterWriter.class.getCanonicalName();
removeRegisteredMBeans("prov1", "proc1", "proc2", "w1");
}
}
@@ -282,9 +269,6 @@ public class LocalStreamBuilderTest extends RandomizedTest {
builder.start();
assertEquals(numDatums, DatumCounterWriter.COUNTS.get("writer").get());
} finally {
- String provClass = "-"+NumericMessageProvider.class.getCanonicalName();
- String procClass = "-"+PassthroughDatumCounterProcessor.class.getCanonicalName();
- String writerClass = "-"+DatumCounterWriter.class.getCanonicalName();
removeRegisteredMBeans("prov1", "proc1", "w1");
}
}
@@ -306,9 +290,6 @@ public class LocalStreamBuilderTest extends RandomizedTest {
//We care mostly that it doesn't terminate too early. With thread shutdowns, etc, the actual time is indeterminate. Just make sure there is an upper bound
assertThat((int) (end - start), is(allOf(greaterThanOrEqualTo(timeout), lessThanOrEqualTo(4 * timeout))));
} finally {
- String provClass = "-"+NumericMessageProvider.class.getCanonicalName();
- String procClass = "-"+PassthroughDatumCounterProcessor.class.getCanonicalName();
- String writerClass = "-"+DatumCounterWriter.class.getCanonicalName();
removeRegisteredMBeans("prov1", "proc1", "proc2", "w1");
}
}
@@ -336,9 +317,6 @@ public class LocalStreamBuilderTest extends RandomizedTest {
service.awaitTermination(30000, TimeUnit.MILLISECONDS);
assertThat(Thread.activeCount(), is(equalTo(before)));
} finally {
- String provClass = "-"+NumericMessageProvider.class.getCanonicalName();
- String procClass = "-"+PassthroughDatumCounterProcessor.class.getCanonicalName();
- String writerClass = "-"+DatumCounterWriter.class.getCanonicalName();
removeRegisteredMBeans("prov1", "proc1", "w1");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/tasks/BasicTasksTest.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/tasks/BasicTasksTest.java b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/tasks/BasicTasksTest.java
index a0e28cd..2d28602 100644
--- a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/tasks/BasicTasksTest.java
+++ b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/tasks/BasicTasksTest.java
@@ -19,8 +19,6 @@
package org.apache.streams.local.tasks;
import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.local.counters.DatumStatusCounter;
-import org.apache.streams.local.counters.StreamsTaskCounter;
import org.apache.streams.local.queues.ThroughputQueue;
import org.apache.streams.local.test.processors.PassthroughDatumCounterProcessor;
import org.apache.streams.local.test.providers.NumericMessageProvider;
@@ -29,9 +27,6 @@ import org.apache.streams.util.ComponentUtils;
import org.junit.After;
import org.junit.Test;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-import java.lang.management.ManagementFactory;
import java.util.Queue;
import java.util.concurrent.*;
@@ -43,7 +38,6 @@ import static org.junit.Assert.*;
public class BasicTasksTest {
- private static final String MBEAN_ID = "test_bean";
@After
public void removeLocalMBeans() {
try {
@@ -93,7 +87,7 @@ public class BasicTasksTest {
assertTrue("Task should have completed running in aloted time.", service.isTerminated());
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- }
+ };
}
@Test
@@ -101,8 +95,6 @@ public class BasicTasksTest {
int numMessages = 100;
PassthroughDatumCounterProcessor processor = new PassthroughDatumCounterProcessor("");
StreamsProcessorTask task = new StreamsProcessorTask(processor);
- StreamsTaskCounter counter = new StreamsTaskCounter(MBEAN_ID);
- task.setStreamsTaskCounter(counter);
BlockingQueue<StreamsDatum> outQueue = new LinkedBlockingQueue<>();
BlockingQueue<StreamsDatum> inQueue = createInputQueue(numMessages);
task.addOutputQueue(outQueue);
@@ -122,7 +114,8 @@ public class BasicTasksTest {
fail("Processor task failed to output "+numMessages+" in a timely fashion.");
}
}
- task.stopTask();;
+ task.stopTask();
+ assertEquals(numMessages, processor.getMessageCount());
service.shutdown();
try {
if(!service.awaitTermination(5, TimeUnit.SECONDS)){
@@ -133,11 +126,6 @@ public class BasicTasksTest {
} catch (InterruptedException e) {
fail("Test Interupted.");
}
- assertEquals(numMessages, processor.getMessageCount());
- assertEquals(numMessages, counter.getNumReceived());
- assertEquals(numMessages, counter.getNumEmitted());
- assertEquals(0, counter.getNumUnhandledErrors());
- assertEquals(0.0, counter.getErrorRate(), 0.0);
}
@Test
@@ -145,8 +133,6 @@ public class BasicTasksTest {
int numMessages = 100;
DatumCounterWriter writer = new DatumCounterWriter("");
StreamsPersistWriterTask task = new StreamsPersistWriterTask(writer);
- StreamsTaskCounter counter = new StreamsTaskCounter(MBEAN_ID);
- task.setStreamsTaskCounter(counter);
BlockingQueue<StreamsDatum> outQueue = new LinkedBlockingQueue<>();
BlockingQueue<StreamsDatum> inQueue = createInputQueue(numMessages);
@@ -174,6 +160,7 @@ public class BasicTasksTest {
}
}
task.stopTask();
+ assertEquals(numMessages, writer.getDatumsCounted());
service.shutdown();
try {
if(!service.awaitTermination(5, TimeUnit.SECONDS)){
@@ -184,11 +171,6 @@ public class BasicTasksTest {
} catch (InterruptedException e) {
fail("Test Interupted.");
}
- assertEquals(numMessages, writer.getDatumsCounted());
- assertEquals(numMessages, counter.getNumReceived());
- assertEquals(0, counter.getNumEmitted());
- assertEquals(0, counter.getNumUnhandledErrors());
- assertEquals(0.0, counter.getErrorRate(), 0.0);
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/DEPENDENCIES b/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/DEPENDENCIES
deleted file mode 100644
index 32cd901..0000000
--- a/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/DEPENDENCIES
+++ /dev/null
@@ -1,123 +0,0 @@
-// ------------------------------------------------------------------
-// Transitive dependencies of this project determined from the
-// maven pom organized by organization.
-// ------------------------------------------------------------------
-
-streams-runtime-pig
-
-
-From: 'an unknown organization'
- - FindBugs-Annotations (http://findbugs.sourceforge.net/) com.google.code.findbugs:annotations:jar:1.3.9
- License: GNU Lesser Public License (http://www.gnu.org/licenses/lgpl.html)
- - Guava: Google Core Libraries for Java (http://code.google.com/p/guava-libraries/guava) com.google.guava:guava:bundle:17.0
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - DataFu (http://data.linkedin.com/opensource/datafu) com.linkedin.datafu:datafu:jar:1.2.0
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Bean Validation API javax.validation:validation-api:jar:1.0.0.GA
- License: Apache License, Version 2.0 (license.txt)
- - jaxb-api javax.xml.bind:jaxb-api:jar:2.1
-
- - jsr173_api javax.xml.bind:jsr173_api:jar:1.0
-
- - stax-api javax.xml.stream:stax-api:jar:1.0-2
-
- - JAXB Utilities (http://www.ultraq.net.nz/programming/jaxb-utilities/) nz.net.ultraq.jaxb:jaxb-utilities:jar:1.2.6
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - JSON in Java (https://github.com/douglascrockford/JSON-java) org.json:json:jar:20140107
- License: The JSON License (http://json.org/license.html)
- - jsonschema2pojo-core (https://github.com/joelittlejohn/jsonschema2pojo/jsonschema2pojo-core) org.jsonschema2pojo:jsonschema2pojo-core:jar:0.4.5
- License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-
-From: 'Carrot Search s.c.' (http://carrotsearch.com)
- - RandomizedTesting Randomized Runner (http://labs.carrotsearch.com/randomizedtesting-runner) com.carrotsearch.randomizedtesting:randomizedtesting-runner:jar:2.1.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-From: 'Codehaus' (http://www.codehaus.org/)
- - Stax2 API (http://woodstox.codehaus.org/StAX2) org.codehaus.woodstox:stax2-api:jar:3.1.1
- License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
-
-From: 'com.typesafe'
- - config (https://github.com/typesafehub/config) com.typesafe:config:bundle:1.2.0
- License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-
-From: 'FasterXML' (http://fasterxml.com)
- - Jackson (http://jackson.codehaus.org) org.codehaus.jackson:jackson-core-asl:jar:1.8.8
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Data Mapper for Jackson (http://jackson.codehaus.org) org.codehaus.jackson:jackson-mapper-asl:jar:1.9.11
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Xml Compatibility extensions for Jackson (http://jackson.codehaus.org) org.codehaus.jackson:jackson-xc:jar:1.8.8
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License (LGPL), Version 2.1 (http://www.fsf.org/licensing/licenses/lgpl.txt)
-
-From: 'FasterXML' (http://fasterxml.com/)
- - aalto-xml (http://github.com/FasterXML/aalto-xml/) com.fasterxml:aalto-xml:jar:0.9.9
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Jackson-annotations (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-annotations:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-core (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-core:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - jackson-databind (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-databind:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-dataformat-XML (http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) com.fasterxml.jackson.dataformat:jackson-dataformat-xml:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-dataformat-YAML (http://wiki.fasterxml.com/JacksonExtensionYAML) com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-datatype-Joda (http://wiki.fasterxml.com/JacksonModuleJoda) com.fasterxml.jackson.datatype:jackson-datatype-joda:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-datatype-json.org (http://wiki.fasterxml.com/JacksonModuleProjects) com.fasterxml.jackson.datatype:jackson-datatype-json-org:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
- - Jackson-module-JAXB-annotations (http://wiki.fasterxml.com/JacksonJAXBAnnotations) com.fasterxml.jackson.module:jackson-module-jaxb-annotations:bundle:2.3.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) License: GNU Lesser General Public License, Version 2.1 (http://www.gnu.org/licenses/lgpl-2.1.html)
-
-From: 'fasterxml.com' (http://fasterxml.com)
- - Jackson-XML-databind (http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) com.fasterxml:jackson-xml-databind:bundle:0.6.2
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-From: 'Google, Inc.' (http://www.google.com)
- - Gson (http://code.google.com/p/google-gson/) com.google.code.gson:gson:jar:2.2.4
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-From: 'Joda.org' (http://www.joda.org)
- - Joda time (http://joda-time.sourceforge.net) joda-time:joda-time:jar:2.2
- License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-From: 'Oracle' (http://www.oracle.com/)
- - Codemodel Core (http://codemodel.java.net/codemodel/) com.sun.codemodel:codemodel:jar:2.6
- License: CDDL v1.1 / GPL v2 dual license (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
-
-From: 'Oracle Corporation' (http://www.oracle.com/)
- - istack common utility code runtime (http://java.net/istack-commons/istack-commons-runtime/) com.sun.istack:istack-commons-runtime:jar:2.16
- License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) License: GPL2 w/ CPE (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
- - JAXB CORE (http://jaxb.java.net/) com.sun.xml.bind:jaxb-core:jar:2.2.7
- License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) License: GPL2 w/ CPE (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
- - JAXB Reference Implementation (http://jaxb.java.net/) com.sun.xml.bind:jaxb-impl:jar:2.2.7
- License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) License: GPL2 w/ CPE (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
-
-From: 'Oracle Corpration' (http://www.oracle.com)
- - fastinfoset (http://fi.java.net) com.sun.xml.fastinfoset:FastInfoset:jar:1.2.12
- License: Apache License, Version 2.0 (http://www.opensource.org/licenses/apache2.0.php)
-
-From: 'QOS.ch' (http://www.qos.ch)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.6
- License: MIT License (http://www.opensource.org/licenses/mit-license.php)
-
-From: 'The Apache Software Foundation' (http://www.apache.org/)
- - Commons IO (http://commons.apache.org/io/) commons-io:commons-io:jar:2.4
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Commons Lang (http://commons.apache.org/lang/) commons-lang:commons-lang:jar:2.5
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Commons Collections (http://commons.apache.org/proper/commons-collections/) org.apache.commons:commons-collections4:jar:4.0
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Commons Lang (http://commons.apache.org/lang/) org.apache.commons:commons-lang3:jar:3.1
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - streams-config (http://incubator.apache.org/streams/streams-project/streams-config) org.apache.streams:streams-config:jar:0.1-SNAPSHOT
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - streams-core (http://incubator.apache.org/streams/streams-project/streams-core) org.apache.streams:streams-core:jar:0.1-SNAPSHOT
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - streams-pojo (http://incubator.apache.org/streams/streams-project/streams-pojo) org.apache.streams:streams-pojo:jar:0.1-SNAPSHOT
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - streams-util (http://incubator.apache.org/streams/streams-project/streams-util) org.apache.streams:streams-util:jar:0.1-SNAPSHOT
- License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/DISCLAIMER
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/DISCLAIMER b/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/DISCLAIMER
deleted file mode 100644
index e447688..0000000
--- a/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/DISCLAIMER
+++ /dev/null
@@ -1,10 +0,0 @@
-streams-runtime-pig is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/LICENSE b/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/55fb235e/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/NOTICE b/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index fd6568b..0000000
--- a/streams-runtimes/streams-runtime-pig/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-
-streams-runtime-pig
-Copyright 2012-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-