incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/16] git commit: Fixing license issues.
Date Wed, 31 Oct 2012 02:36:14 GMT
Fixing license issues.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/99a0c2ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/99a0c2ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/99a0c2ae

Branch: refs/heads/0.2-dev
Commit: 99a0c2ae4c5cdce5a11434968c61c8ebbc80e432
Parents: 6175969
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Oct 30 22:26:20 2012 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Oct 30 22:26:20 2012 -0400

----------------------------------------------------------------------
 .../blur/thrift/IndexSearcherParallelCall.java     |   16 +++++++++
 .../java/org/apache/blur/thrift/SessionInfo.java   |   26 +++++++++++----
 src/blur-gui/src/main/webapp/d3.v2.js              |   17 ---------
 3 files changed, 35 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/99a0c2ae/src/blur-core/src/main/java/org/apache/blur/thrift/IndexSearcherParallelCall.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/thrift/IndexSearcherParallelCall.java
b/src/blur-core/src/main/java/org/apache/blur/thrift/IndexSearcherParallelCall.java
index bfa46f6..03f1f0e 100644
--- a/src/blur-core/src/main/java/org/apache/blur/thrift/IndexSearcherParallelCall.java
+++ b/src/blur-core/src/main/java/org/apache/blur/thrift/IndexSearcherParallelCall.java
@@ -1,5 +1,21 @@
 package org.apache.blur.thrift;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import org.apache.blur.utils.ForkJoin.ParallelCall;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.TopFieldDocs;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/99a0c2ae/src/blur-core/src/main/java/org/apache/blur/thrift/SessionInfo.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/thrift/SessionInfo.java b/src/blur-core/src/main/java/org/apache/blur/thrift/SessionInfo.java
index 435d1c7..f0bb718 100644
--- a/src/blur-core/src/main/java/org/apache/blur/thrift/SessionInfo.java
+++ b/src/blur-core/src/main/java/org/apache/blur/thrift/SessionInfo.java
@@ -1,5 +1,21 @@
 package org.apache.blur.thrift;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -12,7 +28,7 @@ import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.IndexSearcher;
 
 public class SessionInfo {
-  
+
   private static final Log LOG = LogFactory.getLog(SessionInfo.class);
 
   private String uuid;
@@ -39,7 +55,7 @@ public class SessionInfo {
   public void add(int index, IndexReader indexReader) {
     readers.put(index, indexReader);
   }
-  
+
   public void add(int index, IndexSearcher indexSearcher) {
     searchers.put(index, indexSearcher);
   }
@@ -66,13 +82,9 @@ public class SessionInfo {
       try {
         reader.decRef();
       } catch (IOException e) {
-        LOG.error("Unknown exception while trying to decRef on reader [{0}]",e,reader);
+        LOG.error("Unknown exception while trying to decRef on reader [{0}]", e, reader);
       }
     }
   }
-  
-  
-  
-  
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/99a0c2ae/src/blur-gui/src/main/webapp/d3.v2.js
----------------------------------------------------------------------
diff --git a/src/blur-gui/src/main/webapp/d3.v2.js b/src/blur-gui/src/main/webapp/d3.v2.js
index 2608a0c..87affa0 100644
--- a/src/blur-gui/src/main/webapp/d3.v2.js
+++ b/src/blur-gui/src/main/webapp/d3.v2.js
@@ -1,20 +1,3 @@
-/**
- * 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.
- */
-
 (function() {
   function d3_class(ctor, properties) {
     try {


Mime
View raw message